Compare commits

...

4 Commits

Author SHA1 Message Date
Vitaliy Salnikov a33e2ad05d Fix syntax error 2020-08-10 11:08:06 +03:00
Vitaliy Salnikov 232b7a6d5a Add ability to use separate configurations for Match 2020-08-10 10:54:06 +03:00
Vitaliy Salnikov 59892628d6 Set explicit target for incrementing build number 2020-08-10 10:12:47 +03:00
Vitaliy Salnikov 995a997f2b Increment build number without agvtool 2020-08-07 17:04:00 +03:00
1 changed files with 13 additions and 7 deletions

View File

@ -116,8 +116,10 @@ private_lane :buildConfiguration do |options|
openKeychain(options)
if is_ci
increment_build_number(
build_number: options[:buildNumber]
increment_build_number_in_xcodeproj(
build_number: options[:buildNumber],
xcodeproj: "./#{appName}.xcodeproj",
target: "#{appName}"
)
end
@ -189,7 +191,7 @@ private_lane :buildArchive do |options|
end
lane :CreatePushCertificate do |options|
configuration = get_configuration_for_type(options[:type] || "development")
configuration = get_configuration_for_type(options[:type] || "development", options)
options = configuration.to_options.merge(options)
certificates_path = File.expand_path "../Certificates"
@ -218,7 +220,7 @@ lane :SyncCodeSigning do |options|
end
lane :SyncSymbols do |options|
configuration = get_configuration_for_type(options[:type])
configuration = get_configuration_for_type(options[:type], options)
options = configuration.to_options.merge(options)
appName = options[:appName] || $appName
@ -358,7 +360,7 @@ def sync_code_signing_using_options(options)
end
def fill_up_options_using_configuration_type(options, configuration_type)
configuration = get_configuration_for_type(configuration_type.type)
configuration = get_configuration_for_type(configuration_type.type, options)
configuration.to_options
.merge(get_keychain_options(options))
@ -382,8 +384,12 @@ def get_keychain_options(options)
return {:keychain_name => keychain_name, :keychain_password => keychain_password}
end
def get_configuration_for_type(type)
config_path = File.expand_path "configurations.yaml"
def get_configuration_for_type(type, options)
appName = options[:appName] || $appName
project_config_path = "configurations_#{appName}.yaml"
relative_config_path = File.exists?(project_config_path) ? project_config_path : "configurations.yaml"
config_path = File.expand_path relative_config_path
configuration = Touchlane::Configuration.from_file(config_path, type)
end