From 200a2f0393ff259ba40f2765144a868b5c43ebd4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 15 Dec 2023 14:43:13 -0800 Subject: [PATCH] Temporarily disable signing until we can figure out a new way --- .github/workflows/build.yml | 23 ++++++++++++----------- .github/workflows/release.yml | 22 +++++++++++----------- ci/build-dmg.sh | 16 ++++++++-------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42235bef1..ca8c3df5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,19 +148,20 @@ jobs: if: 'false' # temporarily disabled run: buildcache -s - - name: Import signing certificate - uses: devbotsxyz/xcode-import-certificate@master - with: - certificate-data: ${{secrets.MACOS_CERTIFICATE_DATA}} - certificate-passphrase: ${{secrets.MACOS_CERTIFICATE_PASSWORD}} - keychain-password: ${{secrets.MACOS_KEYCHAIN_PASSWORD}} + #- name: Import signing certificate + # if: 'false' # temporarily disabled + #uses: devbotsxyz/xcode-import-certificate@master + #with: + # certificate-data: ${{secrets.MACOS_CERTIFICATE_DATA}} + # certificate-passphrase: ${{secrets.MACOS_CERTIFICATE_PASSWORD}} + # keychain-password: ${{secrets.MACOS_KEYCHAIN_PASSWORD}} - name: Deploy & codesign application - env: - ASC_USERNAME: ${{secrets.MACOS_ASC_USERNAME}} - ASC_PASSWORD: ${{secrets.MACOS_ASC_PASSWORD}} - ASC_TEAM_ID: ${{secrets.MACOS_ASC_TEAM_ID}} - CODESIGN_IDENT: ${{secrets.MACOS_CODESIGN_IDENT}} + #env: + #ASC_USERNAME: ${{secrets.MACOS_ASC_USERNAME}} + #ASC_PASSWORD: ${{secrets.MACOS_ASC_PASSWORD}} + #ASC_TEAM_ID: ${{secrets.MACOS_ASC_TEAM_ID}} + #CODESIGN_IDENT: ${{secrets.MACOS_CODESIGN_IDENT}} run: ci/build-dmg.sh - name: Upload artifacts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7e3b47c8..41aae6b1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -168,19 +168,19 @@ jobs: SENTRY_URL: ${{secrets.SENTRY_URL}} run: ci/upload-debug-macos.sh - - name: Import signing certificate - uses: devbotsxyz/xcode-import-certificate@master - with: - certificate-data: ${{ secrets.MACOS_CERTIFICATE_DATA }} - certificate-passphrase: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} - keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }} + #- name: Import signing certificate + # uses: devbotsxyz/xcode-import-certificate@master + # with: + # certificate-data: ${{ secrets.MACOS_CERTIFICATE_DATA }} + # certificate-passphrase: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} + # keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }} - name: Deploy & codesign application - env: - ASC_USERNAME: ${{secrets.MACOS_ASC_USERNAME}} - ASC_PASSWORD: ${{secrets.MACOS_ASC_PASSWORD}} - ASC_TEAM_ID: ${{secrets.MACOS_ASC_TEAM_ID}} - CODESIGN_IDENT: ${{secrets.MACOS_CODESIGN_IDENT}} + #env: + # ASC_USERNAME: ${{secrets.MACOS_ASC_USERNAME}} + # ASC_PASSWORD: ${{secrets.MACOS_ASC_PASSWORD}} + # ASC_TEAM_ID: ${{secrets.MACOS_ASC_TEAM_ID}} + # CODESIGN_IDENT: ${{secrets.MACOS_CODESIGN_IDENT}} run: ci/build-dmg.sh - name: Upload artifacts diff --git a/ci/build-dmg.sh b/ci/build-dmg.sh index 57bb89506..233e32765 100755 --- a/ci/build-dmg.sh +++ b/ci/build-dmg.sh @@ -1,10 +1,10 @@ #!/bin/bash -ex cd build/install -for i in Metaforce crashpad_handler; do - if [ -x "Metaforce.app/Contents/MacOS/$i" ]; then - codesign --timestamp --options runtime -s "$CODESIGN_IDENT" "Metaforce.app/Contents/MacOS/$i" - fi -done -create-dmg Metaforce.app --identity="$CODESIGN_IDENT" . -xcrun altool -t osx -f *.dmg --primary-bundle-id com.axiodl.Metaforce \ - --notarize-app -u "$ASC_USERNAME" -p "$ASC_PASSWORD" --team-id "$ASC_TEAM_ID" +#for i in Metaforce crashpad_handler; do +# if [ -x "Metaforce.app/Contents/MacOS/$i" ]; then +# codesign --timestamp --options runtime -s "$CODESIGN_IDENT" "Metaforce.app/Contents/MacOS/$i" +# fi +#done +create-dmg Metaforce.app . #--identity="$CODESIGN_IDENT" . +#xcrun altool -t osx -f *.dmg --primary-bundle-id com.axiodl.Metaforce \ +# --notarize-app -u "$ASC_USERNAME" -p "$ASC_PASSWORD" --team-id "$ASC_TEAM_ID"