diff options
| author | Saturneric <[email protected]> | 2022-05-15 13:40:58 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-05-15 13:53:49 +0000 |
| commit | 9f71cbb10bf20e1c13710cbd61cf00acc8ae6123 (patch) | |
| tree | 920acd8c2383f35cd660154bfcc84ec1e8918401 | |
| parent | fix: need to link bcrypt in mingw for uuid (diff) | |
| download | GpgFrontend-9f71cbb10bf20e1c13710cbd61cf00acc8ae6123.tar.gz GpgFrontend-9f71cbb10bf20e1c13710cbd61cf00acc8ae6123.zip | |
fix: solve debug/release ci problems on macOS ci
| -rw-r--r-- | .github/workflows/debug.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 12 |
2 files changed, 8 insertions, 14 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 9ee690be..0615b530 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -49,16 +49,6 @@ jobs: - name: Git Sumbodule Update run: | git submodule update --init --recursive - - name: Codesign Configuration (macOS) - run: | - echo ${{secrets.MACOS_CERTIFICATE}} | base64 --decode > certificate.p12 - security create-keychain -p gpgfrontend build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p gpgfrontend build.keychain - security import certificate.p12 -k build.keychain -P ${{secrets.MAOS_CERTIFICATE_PWD}} -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k gpgfrontend build.keychain - security set-keychain-settings -lut 3600 - if: matrix.os == 'macos-10.15' - name: Install Dependence (macOS) run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b7de668..3ec10770 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -174,17 +174,21 @@ jobs: run: | security -v unlock-keychain -p gpgfrontend ditto -c -k --keepParent ${{github.workspace}}/build/package/GpgFrontend.app ${{github.workspace}}/build/GpgFrontend.app.zip - hdiutil create ${{github.workspace}}/build/tmp/tmp.dmg -ov -volname "GpgFrontend" -fs HFS+ -srcfolder ${{github.workspace}}/build/package/ + hdiutil create ${{github.workspace}}/build/tmp.dmg -ov \ + -volname "GpgFrontend" -fs HFS+ -srcfolder ${{github.workspace}}/build/package/ mkdir ${{github.workspace}}/build/artifactOut - hdiutil convert ${{github.workspace}}/build/tmp/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg + hdiutil convert ${{github.workspace}}/build/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg - mv ${{github.workspace}}/build/package/GpgFrontend.app.zip ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip + mv ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg \ + ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg + mv ${{github.workspace}}/build/GpgFrontend.app.zip \ + ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip if: matrix.os == 'macos-10.15' - name: Notarize Release Build (macOS) run: | xcrun altool --notarize-app \ - -f ${{github.workspace}}/build/GpgFrontend.app.zip \ + -f ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip \ --primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \ -u ${{secrets.APPLE_DEVELOPER_ID}} \ -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}} |