From b0c0a2d55e568b242b691d2deaff80b9c330939f Mon Sep 17 00:00:00 2001 From: James Magahern Date: Thu, 25 Jun 2026 23:21:42 -0700 Subject: [PATCH] Reset CI keychain search list --- ios/fastlane/Fastfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index b5e6e1f..97378a5 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -32,6 +32,16 @@ def release_version end def ci_login_keychain_path + candidates = [ + "/private/var/lib/act_runner/Library/Keychains/login.keychain-db", + "/var/lib/act_runner/Library/Keychains/login.keychain-db", + "/Users/runner/Library/Keychains/login.keychain-db", + File.expand_path("~/Library/Keychains/login.keychain-db"), + File.expand_path("~/Library/Keychains/login.keychain") + ] + existing_candidate = candidates.find { |path| File.file?(path) } + return existing_candidate if existing_candidate + keychains = sh("security list-keychains -d user", log: false).shellsplit keychains.find { |path| File.basename(path).start_with?("login.keychain") } || keychains.first || "login.keychain" end @@ -51,6 +61,7 @@ platform :ios do ENV["MATCH_KEYCHAIN_NAME"] = ci_login_keychain_path ENV.delete("MATCH_KEYCHAIN_PASSWORD") + sh("security list-keychains -d user -s #{ENV.fetch("MATCH_KEYCHAIN_NAME").shellescape}", log: false) cleanup_ci_signing_identity end