修正OS X CI错误

This commit is contained in:
Trebor-Huang
2021-08-04 19:57:51 +08:00
parent 57dfdacffa
commit eb95cc4b47
2 changed files with 6 additions and 9 deletions

View File

@@ -88,7 +88,7 @@ jobs:
path: ${{steps.sign_app.outputs.signedReleaseFile}} path: ${{steps.sign_app.outputs.signedReleaseFile}}
build-macOS: build-macOS:
runs-on: macos-11.5 runs-on: macos-10.15
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Pack love - name: Pack love
@@ -102,16 +102,14 @@ jobs:
python3 .github/workflows/updateOSXVersion.py python3 .github/workflows/updateOSXVersion.py
mv Techmino.love Techmino.app/Contents/Resources mv Techmino.love Techmino.app/Contents/Resources
- name: Codesign executable - name: Codesign executable
# <identity-id> can be found at running `security find-identity -v` # In secrets:
# <your-password> is any password you like, it is there just to create the keychain
# Add in secrets:
# - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64 # - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64
# - MACOS_CERTIFICATE_PWD: The password # - MACOS_CERTIFICATE_PWD: The password
env: env:
MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }} MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
run: | run: |
echo $MACOS_CERTIFICATE | base64 decode > certificate.p12 echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
security create-keychain -p Techminohaowan build.keychain security create-keychain -p Techminohaowan build.keychain
security default-keychain -s build.keychain security default-keychain -s build.keychain
security unlock-keychain -p Techminohaowan build.keychain security unlock-keychain -p Techminohaowan build.keychain

View File

@@ -59,8 +59,7 @@ info = r"""<?xml version="1.0" encoding="UTF-8"?>
with open("conf.lua", "r") as file: with open("conf.lua", "r") as file:
data = file.read() data = file.read()
versionCode = re.search("build=(\\d+)", data).group(1) versionName = re.search('short="([^"]+)', data).group(1)
# versionName = re.search('short="([^"]+)', data).group(1) print("Updating to", versionName)
print(versionCode)
with open("Techmino.app/Contents/info.plist", "w") as file: with open("Techmino.app/Contents/info.plist", "w") as file:
file.write(info % (versionCode, datetime.datetime.today().year)) file.write(info % (versionName, datetime.datetime.today().year))