Skip to content

Update TC configuration changes from carbon-template #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipppavlov merged 2 commits into from
Aug 25, 2026
Merged

Update TC configuration changes from carbon-template #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a685c3d
Update TC configuration changes from carbon-template
filipppavlov Aug 24, 2026
aa0b857
Fix windows builds on TC
filipppavlov Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .teamcity/MacOS/Project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
id(buildName.toId())
name = buildName

artifactRules = "%env.CMAKE_INSTALL_PREFIX%"
artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"

params {
param("env.SENTRY_CLI_DEBUG_SYMBOL_TYPE", "dsym")
Expand Down Expand Up @@ -154,7 +154,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
authType = token {
token = "%GITHUB_CARBON_PAT%"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
}
}
commitStatusPublisher {
Expand Down Expand Up @@ -188,6 +188,4 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
startsWith("teamcity.agent.jvm.os.name", "Mac OS X")
startsWith("teamcity.agent.jvm.os.arch", agentArchitecture)
}
})


})
18 changes: 9 additions & 9 deletions .teamcity/Windows/Project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ 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", "")
Expand Down Expand Up @@ -141,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
Expand All @@ -167,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",
Expand All @@ -178,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()
}
Expand All @@ -211,7 +211,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
authType = token {
token = "%GITHUB_CARBON_PAT%"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER
filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
}
}
commitStatusPublisher {
Expand Down Expand Up @@ -244,4 +244,4 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
requirements {
startsWith("teamcity.agent.jvm.os.name", "Windows Server")
}
})
})
20 changes: 10 additions & 10 deletions .teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class UniversalBuild() : BuildType({
name = "Create MacOS Universal Binaries"

params{
param("carbon-pipeline-tools-ref", "refs/heads/main")
param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0")
param("universal-output-dir", "%system.teamcity.build.workingDir%/output_build")
param("universal-lib-path", "lib/macOS/universal/AppleClang/")
param("universal-bin-path", "bin/macOS/universal/AppleClang/")
Expand All @@ -32,7 +32,7 @@ class UniversalBuild() : BuildType({
)
}

artifactRules = "%universal-output-dir%"
artifactRules = "%universal-output-dir% => artifact.zip"

vcs {
root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon")
Expand Down Expand Up @@ -88,7 +88,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
}
}
dependency(MacOS.x64_Debug) {
Expand All @@ -97,7 +97,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
}
}

Expand All @@ -107,7 +107,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
}
}
dependency(MacOS.x64_Release) {
Expand All @@ -116,7 +116,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
}
}

Expand All @@ -126,7 +126,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
}
}
dependency(MacOS.x64_Internal) {
Expand All @@ -135,7 +135,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
}
}

Expand All @@ -145,7 +145,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
}
}
dependency(MacOS.x64_TrinityDev) {
Expand All @@ -154,7 +154,7 @@ class UniversalBuild() : BuildType({
}

artifacts {
artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions .teamcity/_Self.kt/buildTypes/PublishToPerforce.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -210,7 +210,7 @@ class Publish(perforce_publish_path: String) : BuildType({
}

artifacts {
artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
}
}
dependency(Windows.Debug) {
Expand All @@ -219,7 +219,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) {
Expand All @@ -228,7 +228,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) {
Expand All @@ -237,7 +237,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) {
Expand All @@ -246,7 +246,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")) {
Expand Down
Loading