Refactor agent requirements to use OS family and architecture

- Use matches("teamcity.agent.jvm.os.family", "Windows") for Windows hosts
- Use equals("env.PROCESSOR_ARCHITECTURE", "AMD64") for docker builds
- Use Linux OS family for WSL hosts
- Add RequirementComparisonType enum for equals/matches support

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: gfraiteur

.teamcity/settings.kts

@@ -70,6 +70,7 @@ object PublicBuild : BuildType({
 
     requirements {
         matches("teamcity.agent.jvm.os.family", "Windows")
+        equals("env.PROCESSOR_ARCHITECTURE", "AMD64")
     }
 
     features {
@@ -148,6 +149,7 @@ object PublicDeployment : BuildType({
 
     requirements {
         matches("teamcity.agent.jvm.os.family", "Windows")
+        equals("env.PROCESSOR_ARCHITECTURE", "AMD64")
     }
 
     features {
@@ -216,6 +218,7 @@ object VersionBump : BuildType({
 
     requirements {
         matches("teamcity.agent.jvm.os.family", "Windows")
+        equals("env.PROCESSOR_ARCHITECTURE", "AMD64")
     }
 
     features {

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/BuildAgentRequirements.cs

@@ -1,32 +1,38 @@
-// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
-
-using JetBrains.Annotations;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.Model;
-
-public record BuildAgentRequirement( string Name, string Value );
-
-[PublicAPI]
-public record BuildAgentRequirements
-{
-    public BuildAgentRequirements( params BuildAgentRequirement[] items )
-    {
-        this.Items = items;
-    }
-
-    public static BuildAgentRequirements Empty { get; } = new();
-
-    public static BuildAgentRequirements Default { get; } = SelfHosted( "caravela04cloud" );
-
-    public static BuildAgentRequirements SelfHosted( string name ) => new( new BuildAgentRequirement( "env.BuildAgentType", name ) );
-
-    public static BuildAgentRequirements JetBrainsHosted( string name ) => new( new BuildAgentRequirement( "teamcity.agent.name", name ) );
-
-    public IReadOnlyList<BuildAgentRequirement> Items { get; init; }
-
-    public BuildAgentRequirements Combine( BuildAgentRequirements other ) => new( this.Items.Concat( other.Items ).ToArray() );
-
-    public virtual bool IsDockerized => false;
+// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+using JetBrains.Annotations;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PostSharp.Engineering.BuildTools.ContinuousIntegration.Model;
+
+public enum RequirementComparisonType
+{
+    Equals,
+    Matches
+}
+
+public record BuildAgentRequirement( string Name, string Value, RequirementComparisonType ComparisonType = RequirementComparisonType.Equals );
+
+[PublicAPI]
+public record BuildAgentRequirements
+{
+    public BuildAgentRequirements( params BuildAgentRequirement[] items )
+    {
+        this.Items = items;
+    }
+
+    public static BuildAgentRequirements Empty { get; } = new();
+
+    public static BuildAgentRequirements Default { get; } = SelfHosted( "caravela04cloud" );
+
+    public static BuildAgentRequirements SelfHosted( string name ) => new( new BuildAgentRequirement( "env.BuildAgentType", name ) );
+
+    public static BuildAgentRequirements JetBrainsHosted( string name ) => new( new BuildAgentRequirement( "teamcity.agent.name", name ) );
+
+    public IReadOnlyList<BuildAgentRequirement> Items { get; init; }
+
+    public BuildAgentRequirements Combine( BuildAgentRequirements other ) => new( this.Items.Concat( other.Items ).ToArray() );
+
+    public virtual bool IsDockerized => false;
 }

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCity/TeamCityBuildConfiguration.cs

@@ -189,12 +189,17 @@ void AddBuildStep( BuildStep newStep )
                 writer.WriteLine();
                 writer.WriteLine( "    requirements {" );
 
-                // TODO: Restore specific agent requirements when JetBrains cloud agent testing is complete.
-                // foreach ( var environmentVariable in this.BuildAgentRequirements.Items )
-                // {
-                //     writer.WriteLine( $"        equals(\"{environmentVariable.Name}\", \"{environmentVariable.Value}\")" );
-                // }
-                writer.WriteLine( "        matches(\"teamcity.agent.jvm.os.family\", \"Windows\")" );
+                foreach ( var requirement in this.BuildAgentRequirements.Items )
+                {
+                    var comparison = requirement.ComparisonType switch
+                    {
+                        RequirementComparisonType.Equals => "equals",
+                        RequirementComparisonType.Matches => "matches",
+                        _ => "equals"
+                    };
+
+                    writer.WriteLine( $"        {comparison}(\"{requirement.Name}\", \"{requirement.Value}\")" );
+                }
 
                 writer.WriteLine( "    }" );
             }

src/PostSharp.Engineering.BuildTools/Docker/ContainerHelper.cs

@@ -1,18 +1,26 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
+using PostSharp.Engineering.BuildTools.ContinuousIntegration.Model;
 using System;
 
 namespace PostSharp.Engineering.BuildTools.Docker;
 
 internal static class ContainerHelper
 {
-    public static string GetBuildAgentType( ContainerHostKind hostKind )
+    public static BuildAgentRequirement[] GetBuildAgentRequirements( ContainerHostKind hostKind )
         => hostKind switch
         {
-            ContainerHostKind.Windows => "docker-win-x64-md",
+            ContainerHostKind.Windows =>
+            [
+                new BuildAgentRequirement( "teamcity.agent.jvm.os.family", "Windows", RequirementComparisonType.Matches ),
+                new BuildAgentRequirement( "env.PROCESSOR_ARCHITECTURE", "AMD64" )
+            ],
 
 #pragma warning disable CS0612 // Type or member is obsolete
-            ContainerHostKind.Wsl => "docker-wsl-x64-md",
+            ContainerHostKind.Wsl =>
+            [
+                new BuildAgentRequirement( "teamcity.agent.jvm.os.family", "Linux", RequirementComparisonType.Matches )
+            ],
 #pragma warning restore CS0612 // Type or member is obsolete
 
             _ => throw new ArgumentOutOfRangeException( nameof(hostKind) )

src/PostSharp.Engineering.BuildTools/Docker/ContainerHostRequirements.cs

@@ -14,8 +14,10 @@ public record ContainerHostRequirements : BuildAgentRequirements
     public ContainerHostKind HostKind { get; }
 
     public ContainerHostRequirements( ContainerHostKind hostKind ) : base(
-        new BuildAgentRequirement( "env.BuildAgentType", ContainerHelper.GetBuildAgentType( hostKind ) ) )
+        ContainerHelper.GetBuildAgentRequirements( hostKind ) )
     {
         this.HostKind = hostKind;
     }
+
+    public override bool IsDockerized => true;
 }