buzzert/Sybil-2
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve CI signing keychain path
Some checks failed
TestFlight / testflight (push) Failing after 18s
Details

Browse Source
This commit is contained in:
James Magahern
2026-06-25 23:08:35 -07:00
parent cbd7a68e57
commit eb4b233e33
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ios/fastlane/Fastfile
View File

@@ -7,6 +7,7 @@ APP_IDENTIFIER = "net.buzzert.sybil2"
SCHEME = "Sybil" SCHEME = "Sybil"
TEAM_ID = "DQQH5H6GBD" TEAM_ID = "DQQH5H6GBD"
PROFILE_NAME = "Sybil AppStore CI" PROFILE_NAME = "Sybil AppStore CI"
SIGNING_IDENTITY = "Apple Distribution: James Magahern (DQQH5H6GBD)"
MATCH_BRANCH = "master" MATCH_BRANCH = "master"
IOS_ROOT = File.expand_path("..", __dir__) IOS_ROOT = File.expand_path("..", __dir__)
PROJECT_FILE = File.join(IOS_ROOT, "Sybil.xcodeproj") PROJECT_FILE = File.join(IOS_ROOT, "Sybil.xcodeproj")
@@ -43,7 +44,7 @@ platform :ios do
create_keychain( create_keychain(
path: keychain_path, path: keychain_path,
password: keychain_password, password: keychain_password,
default_keychain: true, default_keychain: false,
unlock: true, unlock: true,
timeout: 3600, timeout: 3600,
lock_after_timeout: false, lock_after_timeout: false,
@@ -52,6 +53,9 @@ platform :ios do
resolved_keychain_path = ["#{keychain_path}-db", keychain_path].find { |path| File.exist?(path) } || keychain_path resolved_keychain_path = ["#{keychain_path}-db", keychain_path].find { |path| File.exist?(path) } || keychain_path
sh("security default-keychain -s #{resolved_keychain_path.shellescape}", log: false)
sh("security list-keychains -d user -s #{resolved_keychain_path.shellescape}", log: false)
ENV["MATCH_KEYCHAIN_NAME"] = resolved_keychain_path ENV["MATCH_KEYCHAIN_NAME"] = resolved_keychain_path
ENV["MATCH_KEYCHAIN_PASSWORD"] = keychain_password ENV["MATCH_KEYCHAIN_PASSWORD"] = keychain_password
end end
@@ -70,7 +74,7 @@ platform :ios do
identities = sh("security find-identity -v -p codesigning #{keychain_path.shellescape}", log: false) identities = sh("security find-identity -v -p codesigning #{keychain_path.shellescape}", log: false)
UI.message(identities) UI.message(identities)
unless identities.include?("Apple Distribution: James Magahern (DQQH5H6GBD)") unless identities.include?(SIGNING_IDENTITY)
UI.user_error!("The CI keychain does not contain the expected Apple Distribution signing identity") UI.user_error!("The CI keychain does not contain the expected Apple Distribution signing identity")
end end
end end
@@ -143,7 +147,7 @@ platform :ios do
sync_match_signing(readonly: true) sync_match_signing(readonly: true)
verify_ci_signing_identity verify_ci_signing_identity
build_app( build_options = {
project: PROJECT_FILE, project: PROJECT_FILE,
scheme: SCHEME, scheme: SCHEME,
export_method: "app-store", export_method: "app-store",
@@ -152,7 +156,16 @@ platform :ios do
APP_IDENTIFIER => PROFILE_NAME APP_IDENTIFIER => PROFILE_NAME
} }
} }
) }
if ENV["CI"]
build_options[:xcargs] = [
"CODE_SIGN_IDENTITY=#{SIGNING_IDENTITY.shellescape}",
"OTHER_CODE_SIGN_FLAGS=#{("--keychain #{ENV.fetch("MATCH_KEYCHAIN_NAME")}").shellescape}"
].join(" ")
end
build_app(build_options)
upload_to_testflight( upload_to_testflight(
api_key: api_key, api_key: api_key,