Skip to content

Commit e300cd5

Browse files
committed
ci: drop --keychain-password from notarytool submit too
The earlier fix removed --keychain-password from notarytool store-credentials, but it was still on the notarytool submit invocation. Same error: Error: Unknown option '--keychain-password' In notarytool 1.1.2, --keychain-password is not a valid flag for either command. The keychain is already unlocked (set-keychain-settings -lut 21600 keeps it unlocked for 6 hours after the import step's unlock-keychain call), so the keychain is accessible without re-supplying the password. Fix: drop --keychain-password from the submit call. Verified locally that xcrun notarytool 1.1.2 (41) on this Mac accepts --keychain and --keychain-profile but not --keychain-password for submit.
1 parent b4b9ece commit e300cd5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,14 @@ jobs:
446446
--team-id "$MACOS_NOTARY_TEAM_ID" \
447447
--password "$MACOS_NOTARY_PASSWORD" \
448448
--keychain "$MACOS_KEYCHAIN_PATH"
449+
# The submit command in this version of notarytool doesn't
450+
# accept --keychain-password either. The keychain stays
451+
# unlocked for 6 hours (set by set-keychain-settings -lut 21600
452+
# in the import step), so it's still accessible here.
449453
echo "Submitting for notarization (profile: $MACOS_KEYCHAIN_PROFILE)"
450454
xcrun notarytool submit "$BINARY" \
451455
--keychain-profile "$MACOS_KEYCHAIN_PROFILE" \
452456
--keychain "$MACOS_KEYCHAIN_PATH" \
453-
--keychain-password "$MACOS_KEYCHAIN_PASSWORD" \
454457
--wait
455458
echo "Stapling notarization ticket"
456459
xcrun stapler staple "$BINARY"

0 commit comments

Comments
 (0)