From 01bf82aff5c373241cd2dfd4269b450441cc39f3 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Mon, 24 Aug 2026 09:52:22 +0000 Subject: [PATCH 1/2] Update TC configuration changes from carbon-template --- .teamcity/Windows/Project.kt | 28 +++++++++---------- .../_Self.kt/buildTypes/PublishToPerforce.kt | 10 +++---- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 10d7da5..af98ebb 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -42,13 +42,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) id(buildName.toId()) this.name = buildName - artifactRules = "%env.CMAKE_INSTALL_PREFIX%" + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" params { param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - param("VS_DEV_BAT_SWITCHES", "-arch=x64 -vcvars_ver=14.1") + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType) @@ -139,7 +141,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) echo ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password echo New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential echo Write-Host "##teamcity[progressMessage 'Storing symbols']" - echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) echo ^& ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags ^| Tee-Object -file symstore.txt echo ${'$'}stored = get-content symstore.txt ^| Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" echo ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value @@ -165,7 +167,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}Password = ConvertTo-SecureString -String "%DOMAIN_USER_PASSWORD%" -AsPlainText -Force ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential - + Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", "/compress", @@ -176,16 +178,16 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) "/r", # Recursive "/f", "%env.CMAKE_BUILD_FOLDER%") # source folder & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt - + ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value - + ${'$'}errors = get-content symstore.txt | Select-String "^SYMSTORE: Number of errors = (.*)${'$'}" ${'$'}errors = ${'$'}errors.Matches.Groups[1].Value - + ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value - + Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() } @@ -209,11 +211,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) authType = token { token = "%GITHUB_CARBON_PAT%" } - filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER - filterTargetBranch = """ - +:refs/heads/* - -:refs/heads/release/1.x - """.trimIndent() + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY } } commitStatusPublisher { @@ -236,7 +234,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) failBuild = true } sshAgent { - teamcitySshKey = "ccpgames-carbon" + teamcitySshKey = "ccpgames-evetech GitHub" } provideAwsCredentials { awsConnectionId = "Carbon_AwsVcpkgBinaryCacheServiceAccount" @@ -246,4 +244,4 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) requirements { startsWith("teamcity.agent.jvm.os.name", "Windows Server") } -}) +}) \ No newline at end of file diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index c0efec0..29841ad 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -33,7 +33,7 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.P4PORT", "p4is.ccp.ad.local:1666") param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") param("env.TC_EVE_PROJECT", "%project%") - param("carbon-pipeline-tools-ref", "refs/heads/main") + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") select("eve_branch_path", "//%project%/%eve_branch_shortname%/", label = "Perforce branch", description = "Is this a regular perforce branch or a perforce stream? Used for setting the proper branch path.", display = ParameterDisplay.PROMPT, options = listOf("Regular" to "//%project%/branches/%eve_branch_type%/%eve_branch_shortname%/", "Frontier Stream" to "//%project%/%eve_branch_shortname%/")) select("eve_branch_type", "sandbox", label = "Branch type", description = "The type of branch to publish into", display = ParameterDisplay.PROMPT, @@ -199,7 +199,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { - artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" } } dependency(Windows.Internal) { @@ -208,7 +208,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { - artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" } } dependency(Windows.Release) { @@ -217,7 +217,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { - artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" } } dependency(Windows.TrinityDev) { @@ -226,7 +226,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { - artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" } } artifacts(AbsoluteId("Infrastructure_MetaTeamCity_Tools_TeamcityChanges")) { From 7a565e25eb684ded56f1e8f34cac074d89cfc2e0 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Mon, 24 Aug 2026 11:48:52 +0000 Subject: [PATCH 2/2] Remove toolset choice in TC --- .teamcity/Windows/Project.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index af98ebb..f60585f 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -48,9 +48,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", - options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) - param("VS_DEV_BAT_SWITCHES", "-arch=x64") + param("VS_DEV_BAT_SWITCHES", "-arch=x64 -vcvars_ver=14.1") param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType)