bit
/
taskman_teamcity
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix teamcity find artifacts

This commit is contained in:
Зеленцов Никита 2022-07-29 12:06:54 +03:00
parent 3c53bb6dc1
commit 961c983966
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -5,6 +5,13 @@ 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.0] - 2022-07-29
### Added
- Add build type for china env
### Changes
- Remove "Setup Skeletor" task
- Combine env var with artifacts path with artifacts rules
## [1.2.1] - 2022-07-19
### Added
- Environment param for set artifact path

38
teamcity/settings.kts.in
View File

@ -68,23 +68,16 @@ project {
object BuildAndroid : BuildAndroidType("", "prod/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_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
artifactRules = "%build.env.artifactRules%"
vcs {
root(GitProjectRepo)
@ -94,8 +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.artifactPath", "artifacts/android/")
param("build.env.artifactRules", "*.apk\n*.aab")
param("build.env.artifactRules", "artifacts/android/*.apk\nartifacts/android/*.aab")
}
features {
@ -115,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"
@ -143,16 +131,7 @@ open class BuildAndroidType(name_suffix : String, environment : String) :
open class BuildIOSType(name_suffix : String, environment : String) :
BuildType({
name = "Build IOS " + name_suffix
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
artifactRules = "%build.env.artifactRules%"
vcs {
root(GitProjectRepo)
@ -162,8 +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.artifactPath", "artifacts/ios/")
param("build.env.artifactRules", "*.ipa")
param("build.env.artifactRules", "artifacts/ios/*.ipa")
}
features {
@ -183,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"