From b8e0acf5b821c83b713d14587f3ab4e29328ea5d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 2 Nov 2023 12:18:01 +0100 Subject: [PATCH] macOS/sign.sh: don't fail if keychain exists This makes the script reentrant, allowing to run it also interactively repeatedly, provided that the `apple_key_p12_b64` and `notarytool_credentials` environment variables are correctly set. --- .github/scripts/macOS/sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/macOS/sign.sh b/.github/scripts/macOS/sign.sh index be7fce157..0d79ef5ac 100755 --- a/.github/scripts/macOS/sign.sh +++ b/.github/scripts/macOS/sign.sh @@ -27,7 +27,7 @@ KEY_CHAIN_PASS=build KEY_FILE=/tmp/signing_key.p12 KEY_FILE_PASS=dummy echo "$apple_key_p12_b64" | base64 -d > $KEY_FILE -security create-keychain -p $KEY_CHAIN_PASS $KEY_CHAIN +security create-keychain -p $KEY_CHAIN_PASS $KEY_CHAIN || true security default-keychain -s $KEY_CHAIN security unlock-keychain -p $KEY_CHAIN_PASS $KEY_CHAIN security import "$KEY_FILE" -A -P "$KEY_FILE_PASS"