Merge pull request #1341 from ghutchis/finish-mac-notarytool

Add team-id secret for Mac notarytool
OpenChemistry · Sep 13, 2023 · f244621 · f244621
2 parents 7964d25 + c45db38
commit f244621
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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