Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion scripts/ci/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4360,15 +4360,28 @@ import_apple_developer_certificate() {

security create-keychain -p "${keychain_password}" "${keychain}"
security default-keychain -s "${keychain}"
# Identity validation and codesign resolve the certificate chain through the
# user search list, which a new keychain is not on. Keep the existing entries.
local search_list=() search_path
while IFS= read -r search_path; do
search_path="$(printf '%s' "${search_path}" | sed -e 's/^[[:space:]]*"//' -e 's/"[[:space:]]*$//')"
[ -n "${search_path}" ] && search_list+=("${search_path}")
done < <(security list-keychains -d user)
security list-keychains -d user -s "${keychain}" ${search_list[@]+"${search_list[@]}"}
security unlock-keychain -p "${keychain_password}" "${keychain}"
security set-keychain-settings -t 3600 -u "${keychain}"
security import "${cert_file}" -k "${keychain}" -P "${APPLE_CERTIFICATE_PASSWORD}" -T /usr/bin/codesign -T /usr/bin/productbuild
# Apple's Developer ID intermediate (www.apple.com/certificateauthority/DeveloperIDG2CA.cer,
# SHA-256 F16CD3C5...43D2DF3A). GitHub's macOS images preinstall it, Blacksmith's
# macOS 27 image does not, and without it the identity is not valid.
security import "${REPO_ROOT}/scripts/ci/apple-developer-id-g2.pem" -k "${keychain}"
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${keychain_password}" "${keychain}"

cert_info="$(security find-identity -v -p codesigning "${keychain}" | grep "Developer ID Application" | head -n 1 || true)"
if [ -z "${cert_info}" ]; then
echo "No Developer ID Application identity found in imported Apple certificate." >&2
security find-identity -v -p codesigning "${keychain}" >&2 || true
# Without -v, invalid identities are listed with the reason they failed.
security find-identity -p codesigning "${keychain}" >&2 || true
return 1
fi

Expand Down
25 changes: 25 additions & 0 deletions scripts/ci/apple-developer-id-g2.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
-----BEGIN CERTIFICATE-----
MIIEPjCCAyagAwIBAgIUf7QAP82XSXrLg02SpIp4c8KEXUMwDQYJKoZIhvcNAQEL
BQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsT
HUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBS
b290IENBMB4XDTIxMDkyMjE4NTUxMFoXDTMxMDkxNzAwMDAwMFowXjEtMCsGA1UE
AwwkRGV2ZWxvcGVyIElEIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQswCQYDVQQL
DAJHMjETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0GCSqG
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTLJVoIVSRir9lccIYTvbNDeGRKHXXA7qV
H9MSmVJE3oBGZ/wpiwCFiIowh01Mbkq0x+UC49djTKrM6uzbQi+RfSXpX6RLKlRv
F6wwnykoNKR/j+V4410jKiFG0InDX/hql51xGxiosgzJAwo1sgKnLfWz3BuDxSch
QHKm5zd2Mee7Br90svZwrEysLc3JXkWLz/sI5mLVQJW1N1zMGw7h79yl5Y3JULdA
nwojJUVAj5Rne+CU6jnTeKU00cLL4DN/LrYsw+Um1SXOqo0qd/yeFJaX4PVfLvLo
p3GnO6OZTHoio03vcBHV1oaBgvFnM5MzWkCxksSqc5YdxFz/4es3AgMBAAGjge8w
gewwEgYDVR0TAQH/BAgwBgEB/wIBADAfBgNVHSMEGDAWgBQr0GlHlHYJ/vRrjS5A
pvdHTX8IXjBEBggrBgEFBQcBAQQ4MDYwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3Nw
LmFwcGxlLmNvbS9vY3NwMDMtYXBwbGVyb290Y2EwLgYDVR0fBCcwJTAjoCGgH4Yd
aHR0cDovL2NybC5hcHBsZS5jb20vcm9vdC5jcmwwHQYDVR0OBBYEFPg6DGkRduDt
rNHrpln6N9XEVbAeMA4GA1UdDwEB/wQEAwIBBjAQBgoqhkiG92NkBgIGBAIFADAN
BgkqhkiG9w0BAQsFAAOCAQEAwf1DClm/8bG3QxBa1hgyMBRWJuERSGMraXKXSB+O
W8peJhX7dCOAM1QzGaEihlrYuEtpqqfOlpbCCsc1atBvzoppg2JtSjn1/oNN16LU
iB/tiMAP+PkzHrQQt8JcETdENwSwpESdjGgNe30dfsy1k/DWbz0VeoCldNPhj33S
iOgxp5jFH9/iglmugIFgRhbsnrmKQKobKuFhhgqMcA/ZSizsTKIFEdZ5jKVjJSEj
Am+TW1pXoddFbd/M93+fX9vH7WSnb0Qvb009eHgKVrQ71zrIK2Wik+rbWOqO1LnE
wDD8MhpNupIMJDmYgjqgmd7n5OS8DryFr1qrXND828wQww==
-----END CERTIFICATE-----
Loading