fix: Use specific notary keychain to avoid issues with locking (#952)

* fix: Use specific notary keychain to avoid issues locking
espressif · May 16, 2024 · 6356f40 · 6356f40
1 parent a860489
commit 6356f40
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/.github/workflows/ci_beta.yml b/.github/workflows/ci_beta.yml
@@ -63,27 +63,28 @@ jobs:
         /usr/bin/codesign --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg -v
         /usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
     
-    - name: Notarization of Espressif-IDE-macosx-cocoa-x86_64.dmg
+    - name: Notarization of Espressif-IDE dmg files
       env: 
         NOTARIZATION_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
         NOTARIZATION_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
         NOTARIZATION_TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
       run: |
+        echo "Create notary keychain"
+        /usr/bin/security create-keychain -p espressif notary.keychain
+        /usr/bin/security default-keychain -s notary.keychain
+        /usr/bin/security unlock-keychain -p espressif notary.keychain
+
         echo "Create keychain profile"
         xcrun notarytool store-credentials "ide-notarytool-profile" --apple-id $NOTARIZATION_USERNAME --team-id $NOTARIZATION_TEAM_ID --password $NOTARIZATION_PASSWORD
         xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg --keychain-profile "ide-notarytool-profile" --wait
+        
         echo "Attach staple for x86_64.dmg"
         xcrun stapler staple $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
-    
-    - name: Notarization of Espressif-IDE-macosx-cocoa-aarch64.dmg
-      env: 
-        NOTARIZATION_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
-        NOTARIZATION_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
-        NOTARIZATION_TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
-      run: |
-        echo "Create keychain profile"
-        xcrun notarytool store-credentials "ide-notarytool-profile-arm64" --apple-id $NOTARIZATION_USERNAME --team-id $NOTARIZATION_TEAM_ID --password $NOTARIZATION_PASSWORD
-        xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg --keychain-profile "ide-notarytool-profile-arm64" --wait
+        
+        echo "Unlock the notary keychain"
+        /usr/bin/security unlock-keychain -p espressif notary.keychain
+
+        xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg --keychain-profile "ide-notarytool-profile" --wait
         echo "Attach staple for aarch64.dmg"
         xcrun stapler staple $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg