TouchInstinct
/
BuildScripts
304
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge pull request #203 from TouchInstinct/fix/SyncCodeSigning 

remove private lane syncCodeSigning, use public SyncCodeSigning instead
This commit is contained in:
Ivan Smolin 2020-06-11 14:07:12 +03:00 committed by GitHub
parent 7eeaf845ac ad099aa9c9
commit 03d1aa08a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
xcode/commonFastfile
View File

@ -111,11 +111,7 @@ private_lane :buildConfiguration do |options|
options[:xcconfig_name] = lane_name options[:xcconfig_name] = lane_name
configuration_type = Touchlane::ConfigurationType.from_lane_name(lane_name) configuration_type = Touchlane::ConfigurationType.from_lane_name(lane_name)
configuration = get_configuration_for_type(configuration_type.type) options = fill_up_options_using_configuration_type(options, configuration_type)
options = configuration.to_options
.merge(get_keychain_options(options))
.merge(options)
openKeychain(options) openKeychain(options)
@ -209,23 +205,11 @@ lane :createPushCertificate do |options|
) )
end end
lane :syncCodeSigning do |options| lane :SyncCodeSigning do |options|
match( configuration_type = Touchlane::ConfigurationType.from_type(options[:type])
app_identifier: options[:app_identifier], options = fill_up_options_using_configuration_type(options, configuration_type)
username: options[:username] || options[:apple_id],
team_id: options[:team_id], sync_code_signing_using_options(options)
type: options[:type],
readonly: options[:readonly].nil? ? true : options[:readonly],
storage_mode: "git",
git_url: options[:git_url],
git_branch: "fastlane_certificates",
shallow_clone: true,
clone_branch_directly: true,
keychain_name: options[:keychain_name],
keychain_password: options[:keychain_password],
skip_docs: true,
platform: "ios"
)
end end
lane :SyncSymbols do |options| lane :SyncSymbols do |options|
@ -349,6 +333,32 @@ lane :ManuallyUpdateCodeSigning do |options|
end end
def sync_code_signing_using_options(options)
match(
app_identifier: options[:app_identifier],
username: options[:username] || options[:apple_id],
team_id: options[:team_id],
type: options[:type],
readonly: options[:readonly].nil? ? true : options[:readonly],
storage_mode: "git",
git_url: options[:git_url],
git_branch: "fastlane_certificates",
shallow_clone: true,
clone_branch_directly: true,
keychain_name: options[:keychain_name],
keychain_password: options[:keychain_password],
skip_docs: true,
platform: "ios"
)
end
def fill_up_options_using_configuration_type(options, configuration_type)
configuration = get_configuration_for_type(configuration_type.type)
configuration.to_options
.merge(get_keychain_options(options))
.merge(options)
end
def get_keychain_options(options) def get_keychain_options(options)
keychain_name = options[:keychain_name] keychain_name = options[:keychain_name]