diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd7fab..a491003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.2.1] - 2022-07-19 +### Added +- Environment param for set artifact path + ## [1.2.0] - 2022-06-23 ### Added - Tasks for build under dev environment, for both platform diff --git a/teamcity/settings.kts.in b/teamcity/settings.kts.in index 8f2b1f7..2b9c414 100644 --- a/teamcity/settings.kts.in +++ b/teamcity/settings.kts.in @@ -73,10 +73,18 @@ object BuildIOSDev : BuildIOSType("Dev", "dev/global_ios") open class BuildAndroidType(name_suffix : String, environment : String) : BuildType({ + name = "Build Android " + name_suffix - var artifact_rules : String = "*.apk\n*.aab" - artifactRules = artifact_rules + var artifact_path : String = "%build.env.artifactPath%" + var artifact_rules : String = "%build.env.artifactRules%" + var artifact_rules_with_path : String = "" + + artifact_rules.split("\n").forEach { + artifact_rules_with_path += artifact_path + it + "\n" + } + + artifactRules = artifact_rules_with_path vcs { root(GitProjectRepo) @@ -86,7 +94,8 @@ open class BuildAndroidType(name_suffix : String, environment : String) : params { param("build.env.buildName", "%system.teamcity.buildConfName%") param("build.env.workDir", "%system.teamcity.build.workingDir%") - param("build.env.artifactRules", artifact_rules) + param("build.env.artifactPath", "artifacts/android/") + param("build.env.artifactRules", "*.apk\n*.aab") } features { @@ -131,13 +140,19 @@ open class BuildAndroidType(name_suffix : String, environment : String) : ) {} - open class BuildIOSType(name_suffix : String, environment : String) : BuildType({ name = "Build IOS " + name_suffix - var artifact_rules : String = "*.ipa" - artifactRules = artifact_rules + var artifact_path : String = "%build.env.artifactPath%" + var artifact_rules : String = "%build.env.artifactRules%" + var artifact_rules_with_path : String = "" + + artifact_rules.split("\n").forEach { + artifact_rules_with_path += artifact_path + it + "\n" + } + + artifactRules = artifact_rules_with_path vcs { root(GitProjectRepo) @@ -147,7 +162,8 @@ open class BuildIOSType(name_suffix : String, environment : String) : params { param("build.env.buildName", "%system.teamcity.buildConfName%") param("build.env.workDir", "%system.teamcity.build.workingDir%") - param("build.env.artifactRules", artifact_rules) + param("build.env.artifactPath", "artifacts/ios/") + param("build.env.artifactRules", "*.ipa") } features {