diff --git a/ios/Apps/Sybil/project.yml b/ios/Apps/Sybil/project.yml index dc2a101..9c19df9 100644 --- a/ios/Apps/Sybil/project.yml +++ b/ios/Apps/Sybil/project.yml @@ -35,8 +35,8 @@ targets: configs: Release: CODE_SIGN_STYLE: Manual - CODE_SIGN_IDENTITY: "Apple Distribution: James Magahern (DQQH5H6GBD)" - "CODE_SIGN_IDENTITY[sdk=iphoneos*]": "Apple Distribution: James Magahern (DQQH5H6GBD)" + CODE_SIGN_IDENTITY: Apple Distribution + "CODE_SIGN_IDENTITY[sdk=iphoneos*]": Apple Distribution PROVISIONING_PROFILE_SPECIFIER: Sybil AppStore CI schemes: diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index bdab972..162f322 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -74,6 +74,8 @@ platform :ios do sh("security default-keychain -d user -s #{CI_KEYCHAIN_PATH.shellescape}", log: false) sh("security list-keychains -d user -s #{ci_keychain_path.shellescape}", log: false) + sh("security list-keychains -d dynamic -s #{ci_keychain_path.shellescape} || true", log: false) + sh("security list-keychains -d common -s #{ci_keychain_path.shellescape} || true", log: false) ENV["MATCH_KEYCHAIN_NAME"] = CI_KEYCHAIN_PATH ENV["MATCH_KEYCHAIN_PASSWORD"] = CI_KEYCHAIN_PASSWORD @@ -169,7 +171,7 @@ platform :ios do xcargs = [ "DEVELOPMENT_TEAM=#{TEAM_ID.shellescape}", "CODE_SIGN_STYLE=Manual", - "CODE_SIGN_IDENTITY=#{SIGNING_IDENTITY.shellescape}", + "CODE_SIGN_IDENTITY=Apple\\ Distribution", "PROVISIONING_PROFILE_SPECIFIER=#{PROFILE_NAME.shellescape}" ] @@ -182,7 +184,7 @@ platform :ios do project: PROJECT_FILE, scheme: SCHEME, export_method: "app-store", - codesigning_identity: SIGNING_IDENTITY, + codesigning_identity: "Apple Distribution", xcargs: xcargs.join(" "), export_options: { signingStyle: "manual",