Обновить teamcity.inc.php

CHANGELOG.md

@@ -5,17 +5,38 @@ 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.3.2] - 2023-01-12
+### Fixed requirements
+- Key words for required agent names
+
+## [1.3.1] - 2023-01-10
+### Changed
+- Move one of agent from ios to android
+
+## [1.3.0] - 2022-07-29
+### Fixed
+- Search "*.aab" artifacts
+### Added
+- Build type for china env
+### Changes
+- Removed "Setup Skeletor" step
+- Environment var "artifactsPath" was combined with "artifactsRules"
+
+## [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
 ### Fixed
 - Removed checkbox "debug" from parameters
-- Fixed changelog description of version 1.1.0
+- Changelog description of version 1.1.0
 
 ## [1.1.0] - 2022-06-07
 ### Fixed
 - Using of deprecated taskman functions
-- Replaced 'try_deps_update' with 'deps_update'
+- Replaced "try_deps_update" with "deps_update"
 
 ## [1.0.1] - 2022-06-07
 ### Added

teamcity.inc.php

@@ -13,7 +13,7 @@ function setup_teamcity_settings($args = array())
 
   $cmd = "git config --get remote.origin.url";
   $url = str_replace("\n", "", shell_exec($cmd));
-  $name = "\"git: ${url}\"";
+  $name = "\"git: $url\"";
   set("TEAM_CITY_SETTINGS_NAME_HERE", $name);
   set("TEAM_CITY_SETTINGS_URL_HERE", "\"$url\"");
 

teamcity/settings.kts.in

@@ -67,16 +67,17 @@ project {
 }
 
 object BuildAndroid : BuildAndroidType("", "prod/global_android")
-object BuildAndroidDev : BuildAndroidType("Dev", "dev/global_android") 
+object BuildAndroidDev : BuildAndroidType("Dev", "dev/global_android")
+object BuildAndroidCh  : BuildAndroidType("Ch", "prod/china_android") 
 object BuildIOS : BuildIOSType("", "prod/global_ios") 
 object BuildIOSDev : BuildIOSType("Dev", "dev/global_ios")
+object BuildIOSCh  : BuildIOSType("Ch", "prod/china_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
+    artifactRules = "%build.env.artifactRules%"
 
     vcs {
         root(GitProjectRepo)
@@ -86,7 +87,7 @@ 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.artifactRules", "artifacts/android/*.apk\nartifacts/android/*.aab")
     }
 
     features {
@@ -106,10 +107,6 @@ open class BuildAndroidType(name_suffix : String, environment : String) :
     }
 
     steps {
-        script {
-            name = "Setup Skeletor"
-            scriptContent = "./setup.sh"
-        }
         script {
             name = "Deps Update"
             scriptContent = "./gamectl deps_update"
@@ -125,19 +122,16 @@ open class BuildAndroidType(name_suffix : String, environment : String) :
     }
 
     requirements {
-        equals("teamcity.agent.name", "Default Agent")
+        matches("teamcity.agent.name", "(Default Agent|Default Agent 2)")
     }
   }
   )
 {}
 
-
 open class BuildIOSType(name_suffix : String, environment : String) : 
   BuildType({
     name = "Build IOS " + name_suffix
-
-    var artifact_rules : String = "*.ipa"
-    artifactRules = artifact_rules
+    artifactRules = "%build.env.artifactRules%"
 
     vcs {
         root(GitProjectRepo)
@@ -147,7 +141,7 @@ 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.artifactRules", "artifacts/ios/*.ipa")
     }
 
     features {
@@ -167,10 +161,6 @@ open class BuildIOSType(name_suffix : String, environment : String) :
     }
 
     steps {
-        script {
-            name = "Setup Skeletor"
-            scriptContent = "./setup.sh"
-        }
         script {
             name = "Deps Update"
             scriptContent = "./gamectl deps_update"
@@ -186,7 +176,7 @@ open class BuildIOSType(name_suffix : String, environment : String) :
     }
 
     requirements {
-        matches("teamcity.agent.name", "(Default Agent 2|Default Agent 3)")
+        equals("teamcity.agent.name", "Default Agent 3")
     }
   })
 {}