Skip to content

Commit 6356f40

Browse files
fix: Use specific notary keychain to avoid issues with locking (#952)
* fix: Use specific notary keychain to avoid issues locking
1 parent a860489 commit 6356f40

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.github/workflows/ci_beta.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,28 @@ jobs:
6363
/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
6464
/usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
6565
66-
- name: Notarization of Espressif-IDE-macosx-cocoa-x86_64.dmg
66+
- name: Notarization of Espressif-IDE dmg files
6767
env:
6868
NOTARIZATION_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
6969
NOTARIZATION_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
7070
NOTARIZATION_TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
7171
run: |
72+
echo "Create notary keychain"
73+
/usr/bin/security create-keychain -p espressif notary.keychain
74+
/usr/bin/security default-keychain -s notary.keychain
75+
/usr/bin/security unlock-keychain -p espressif notary.keychain
76+
7277
echo "Create keychain profile"
7378
xcrun notarytool store-credentials "ide-notarytool-profile" --apple-id $NOTARIZATION_USERNAME --team-id $NOTARIZATION_TEAM_ID --password $NOTARIZATION_PASSWORD
7479
xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg --keychain-profile "ide-notarytool-profile" --wait
80+
7581
echo "Attach staple for x86_64.dmg"
7682
xcrun stapler staple $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
77-
78-
- name: Notarization of Espressif-IDE-macosx-cocoa-aarch64.dmg
79-
env:
80-
NOTARIZATION_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
81-
NOTARIZATION_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
82-
NOTARIZATION_TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
83-
run: |
84-
echo "Create keychain profile"
85-
xcrun notarytool store-credentials "ide-notarytool-profile-arm64" --apple-id $NOTARIZATION_USERNAME --team-id $NOTARIZATION_TEAM_ID --password $NOTARIZATION_PASSWORD
86-
xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg --keychain-profile "ide-notarytool-profile-arm64" --wait
83+
84+
echo "Unlock the notary keychain"
85+
/usr/bin/security unlock-keychain -p espressif notary.keychain
86+
87+
xcrun notarytool submit $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg --keychain-profile "ide-notarytool-profile" --wait
8788
echo "Attach staple for aarch64.dmg"
8889
xcrun stapler staple $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
8990

0 commit comments

Comments
 (0)