From aa1a5a1550147b5d7eee35d34b51eec7e31e7960 Mon Sep 17 00:00:00 2001 From: Trebor-Huang <2300936257@qq.com> Date: Tue, 3 Aug 2021 17:48:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0OS=20X=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 等证书搞好之后改一下里面的id之类的就行。 --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0bd169e..79a12a50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: path: ${{steps.sign_app.outputs.signedReleaseFile}} build-macOS: - runs-on: macos-10.15 + runs-on: macos-11.5 steps: - uses: actions/checkout@v2 - name: Pack love @@ -104,6 +104,22 @@ jobs: - name: Pack Techmino run: | zip -r -y Techmino-Packed.app.zip Techmino.app + - name: Codesign executable + # can be found at running `security find-identity -v` + # 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_PWD: The password + env: + MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} + MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }} + run: | + echo $MACOS_CERTIFICATE | base64 —decode > certificate.p12 + security create-keychain -p build.keychain security default-keychain -s build.keychain + security unlock-keychain -p build.keychain + security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k build.keychain + /usr/bin/codesign --force -s ./Techmino.app -v - name: Artifact uses: actions/upload-artifact@v1.0.0 with: From 0d97d2a02d06162214507a0a92a23809d14a2992 Mon Sep 17 00:00:00 2001 From: Trebor-Huang <2300936257@qq.com> Date: Tue, 3 Aug 2021 22:23:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79a12a50..a0270ccd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,9 +101,6 @@ jobs: run: | python3 .github/workflows/updateOSXVersion.py mv Techmino.love Techmino.app/Contents/Resources - - name: Pack Techmino - run: | - zip -r -y Techmino-Packed.app.zip Techmino.app - name: Codesign executable # can be found at running `security find-identity -v` # is any password you like, it is there just to create the keychain @@ -115,11 +112,15 @@ jobs: MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }} run: | echo $MACOS_CERTIFICATE | base64 —decode > certificate.p12 - security create-keychain -p build.keychain security default-keychain -s build.keychain - security unlock-keychain -p build.keychain + security create-keychain -p Techminohaowan build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p Techminohaowan build.keychain security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k build.keychain - /usr/bin/codesign --force -s ./Techmino.app -v + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k Techminohaowan build.keychain + /usr/bin/codesign --force --deep -s 79B81FC5EA155243C973B5417B0996501F00EF55 ./Techmino.app -v + - name: Pack Techmino + run: | + zip -r -y Techmino-Packed.app.zip Techmino.app - name: Artifact uses: actions/upload-artifact@v1.0.0 with: From eb95cc4b4785dd2dce4614b4bcccb8b60ffa3da7 Mon Sep 17 00:00:00 2001 From: Trebor-Huang <2300936257@qq.com> Date: Wed, 4 Aug 2021 19:57:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3OS=20X=20CI=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 +++----- .github/workflows/updateOSXVersion.py | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0270ccd..e3e39829 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: path: ${{steps.sign_app.outputs.signedReleaseFile}} build-macOS: - runs-on: macos-11.5 + runs-on: macos-10.15 steps: - uses: actions/checkout@v2 - name: Pack love @@ -102,16 +102,14 @@ jobs: python3 .github/workflows/updateOSXVersion.py mv Techmino.love Techmino.app/Contents/Resources - name: Codesign executable - # can be found at running `security find-identity -v` - # is any password you like, it is there just to create the keychain - # Add in secrets: + # In secrets: # - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64 # - MACOS_CERTIFICATE_PWD: The password env: MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }} run: | - echo $MACOS_CERTIFICATE | base64 —decode > certificate.p12 + echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 security create-keychain -p Techminohaowan build.keychain security default-keychain -s build.keychain security unlock-keychain -p Techminohaowan build.keychain diff --git a/.github/workflows/updateOSXVersion.py b/.github/workflows/updateOSXVersion.py index bcab5e94..c550e324 100644 --- a/.github/workflows/updateOSXVersion.py +++ b/.github/workflows/updateOSXVersion.py @@ -59,8 +59,7 @@ info = r""" with open("conf.lua", "r") as file: data = file.read() -versionCode = re.search("build=(\\d+)", data).group(1) -# versionName = re.search('short="([^"]+)', data).group(1) -print(versionCode) +versionName = re.search('short="([^"]+)', data).group(1) +print("Updating to", versionName) 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)) From 3a3c8057928621d7583ec4b72a68da158abdb1c9 Mon Sep 17 00:00:00 2001 From: Trebor-Huang <2300936257@qq.com> Date: Mon, 9 Aug 2021 14:22:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Android=E4=B8=8EOS=20X?= =?UTF-8?q?=E7=9A=84CI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 5 ++++- .github/workflows/getVersion.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40c2836e..a93dc413 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,11 @@ jobs: security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k Techminohaowan build.keychain /usr/bin/codesign --force --deep -s 79B81FC5EA155243C973B5417B0996501F00EF55 ./Techmino.app -v + - name: Pack Techmino + run: | + zip -r -y Techmino-Packed.app.zip Techmino.app - name: Upload uses: actions/upload-artifact@v2 with: name: Techmino_${{ env.Version }}_${{ env.CommitID }}_macOS - path: Techmino-Packed.app \ No newline at end of file + path: Techmino-Packed.app.zip \ No newline at end of file diff --git a/.github/workflows/getVersion.py b/.github/workflows/getVersion.py index 772c2b3a..3bc0230b 100644 --- a/.github/workflows/getVersion.py +++ b/.github/workflows/getVersion.py @@ -2,7 +2,7 @@ import re def getVersion(): with open("conf.lua", "r", encoding="utf-8") as file: data = file.read() - versionCode = re.search("build=(\\d+)", data).group() + versionCode = re.search("build=(\\d+)", data).group(1) versionName = re.search('(?<=string=").*(?=@)', data).group() return versionCode, versionName