diff --git a/.gitea/workflows/testflight-release.yml b/.gitea/workflows/testflight-release.yml index cad5664..2569f5e 100644 --- a/.gitea/workflows/testflight-release.yml +++ b/.gitea/workflows/testflight-release.yml @@ -91,8 +91,7 @@ jobs: developer_dir="$(xcode-select -p)" signing_dir="$(mktemp -d "${RUNNER_TEMP:-${TMPDIR:-/tmp}}/sybil-signing.XXXXXX")" mkdir -p "${HOME}/Library/Keychains" - keychain_dir="$(cd "${HOME}/Library/Keychains" && pwd -P)" - keychain_path="${keychain_dir}/${SIGNING_KEYCHAIN}-${GITHUB_RUN_ID:-$(uuidgen)}.keychain-db" + keychain_name="${SIGNING_KEYCHAIN}-${GITHUB_RUN_ID:-$(uuidgen)}.keychain" certificate_path="${signing_dir}/appstore-signing.p12" wwdr_certificate_path="${signing_dir}/AppleWWDRCAG3.cer" profile_path="${signing_dir}/Sybil_AppStore_CI.mobileprovision" @@ -124,35 +123,37 @@ jobs: base_keychains+=("${existing_keychain}") done < <(security list-keychains -d user | sed 's/[ "]//g') - security delete-keychain "${keychain_path}" >/dev/null 2>&1 || true - rm -f "${keychain_path}" - security create-keychain -p "${keychain_password}" "${keychain_path}" - security set-keychain-settings -lut 21600 "${keychain_path}" - security unlock-keychain -p "${keychain_password}" "${keychain_path}" + security delete-keychain "${keychain_name}" >/dev/null 2>&1 || true + rm -f "${HOME}/Library/Keychains/${keychain_name}-db" + security create-keychain -p "${keychain_password}" "${keychain_name}" + security set-keychain-settings -lut 21600 "${keychain_name}" + security unlock-keychain -p "${keychain_password}" "${keychain_name}" security import "${wwdr_certificate_path}" \ - -k "${keychain_path}" \ + -k "${keychain_name}" \ -T /usr/bin/codesign \ -T /usr/bin/security \ -T /usr/bin/xcodebuild security import "${certificate_path}" \ - -k "${keychain_path}" \ + -k "${keychain_name}" \ -P "${APPSTORE_CERTIFICATES_PASSWORD}" \ -T /usr/bin/codesign \ -T /usr/bin/security \ -T /usr/bin/xcodebuild \ -T "${developer_dir}/usr/bin/xcodebuild" - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${keychain_password}" "${keychain_path}" + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${keychain_password}" "${keychain_name}" if [[ "${#base_keychains[@]}" -gt 0 ]]; then - security list-keychains -d user -s "${keychain_path}" "${base_keychains[@]}" + security list-keychains -d user -s "${keychain_name}" "${base_keychains[@]}" else - security list-keychains -d user -s "${keychain_path}" + security list-keychains -d user -s "${keychain_name}" fi - security default-keychain -d user -s "${keychain_path}" + security default-keychain -d user -s "${keychain_name}" + keychain_path="$(security list-keychains -d user | sed 's/[ "]//g' | head -n 1)" security find-identity -v -p codesigning "${keychain_path}" security find-identity -v -p codesigning echo "Installed ${profile_name} (${profile_uuid}) provisioning profile" { echo "SYBIL_SIGNING_KEYCHAIN_PATH=${keychain_path}" + echo "SYBIL_SIGNING_KEYCHAIN_NAME=${keychain_name}" echo "SYBIL_SIGNING_KEYCHAIN_PASSWORD=${keychain_password}" echo "SYBIL_PREVIOUS_DEFAULT_KEYCHAIN=${previous_default_keychain}" echo "SYBIL_PROVISIONING_PROFILE_UUID=${profile_uuid}"