From c45db386b85466780557c10536537d68b140620e Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Tue, 12 Sep 2023 22:33:09 -0400 Subject: [PATCH] Add team-id secret for Mac notarytool Also will continue on error if notarytool fails (It just means users need a network connection to validate.) Signed-off-by: Geoff Hutchison --- .github/workflows/build_cmake.yml | 5 +++-- .github/workflows/build_m1.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 5e183e5967..6b0913c249 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -276,15 +276,16 @@ jobs: # check if we have the password and the username if [ -n "${NOTARIZE_PASSWORD}" ] && [ -n "${NOTARIZE_USERNAME}" ]; then codesign -s "$CODESIGN_IDENTITY" --timestamp Avogadro2*.dmg - xcrun notarytool submit Avogadro2*.dmg --apple-id "$NOTARIZE_USERNAME" --password "NOTARIZE_PASSWORD" --verbose --wait + xcrun notarytool submit Avogadro2*.dmg --apple-id "$NOTARIZE_USERNAME" --team-id "$NOTARIZE_TEAM" --password "$NOTARIZE_PASSWORD" --verbose --wait xcrun stapler staple -v Avogadro2*.dmg fi working-directory: ${{ runner.workspace }}/build/avogadroapp env: + NOTARIZE_TEAM: ${{ secrets.AC_TEAM }} NOTARIZE_USERNAME: ${{ secrets.AC_USERNAME }} NOTARIZE_PASSWORD: ${{ secrets.AC_PASSWORD }} CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }} - PRODUCT_BUNDLE_IDENTIFIER: cc.avogadro + continue-on-error: true - name: Setup tmate session if: ${{ failure() }} diff --git a/.github/workflows/build_m1.yml b/.github/workflows/build_m1.yml index 0772b9c8c8..7f9e31142b 100644 --- a/.github/workflows/build_m1.yml +++ b/.github/workflows/build_m1.yml @@ -162,14 +162,14 @@ jobs: echo "codesign DMG" codesign -s "$CODESIGN_IDENTITY" --timestamp Avogadro2*.dmg echo "notarizing" - xcrun notarytool submit Avogadro2*.dmg --apple-id "$NOTARIZE_USERNAME" --password "NOTARIZE_PASSWORD" --verbose --wait + xcrun notarytool submit Avogadro2*.dmg --apple-id "$NOTARIZE_USERNAME" --team-id "$NOTARIZE_TEAM" --password "$NOTARIZE_PASSWORD" --verbose --wait xcrun stapler staple -v Avogadro2*.dmg fi env: NOTARIZE_USERNAME: ${{ secrets.AC_USERNAME }} NOTARIZE_PASSWORD: ${{ secrets.AC_PASSWORD }} CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }} - PRODUCT_BUNDLE_IDENTIFIER: cc.avogadro + NOTARIZE_TEAM: ${{ secrets.AC_TEAM }} continue-on-error: true working-directory: ${{ runner.workspace }}/build/avogadroapp