Fix requirements support to allow requirements for "Windows 10" string

JetBrains · Dec 12, 2022 · 0067984 · 0067984
1 parent 6ebddd4
commit 0067984
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.teamcity/generated/PublishHubVersion.kts b/.teamcity/generated/PublishHubVersion.kts
@@ -125,8 +125,7 @@ onDependencyFailure =  FailureAction.FAIL_TO_START
 requirements {
 noLessThanVer("docker.version", "18.05.0")
 contains("docker.server.osType", "windows")
-contains("system.agent.name", "docker")
-contains("system.agent.name", "windows10")
+contains("teamcity.agent.jvm.os.name", "Windows 10")
 }
 features {
 dockerSupport {

diff --git a/.teamcity/generated/PublishLocal.kts b/.teamcity/generated/PublishLocal.kts
@@ -130,8 +130,7 @@ onDependencyFailure =  FailureAction.FAIL_TO_START
 requirements {
 noLessThanVer("docker.version", "18.05.0")
 contains("docker.server.osType", "windows")
-contains("system.agent.name", "docker")
-contains("system.agent.name", "windows10")
+contains("teamcity.agent.jvm.os.name", "Windows 10")
 }
 features {
 dockerSupport {

diff --git a/.teamcity/generated/PushHubWindows.kts b/.teamcity/generated/PushHubWindows.kts
@@ -244,8 +244,7 @@ param("system.teamcity.agent.ensure.free.space", "52gb")
 }
 requirements {
 contains("docker.server.osType", "windows")
-contains("system.agent.name", "docker")
-contains("system.agent.name", "windows10")
+contains("teamcity.agent.jvm.os.name", "Windows 10")
 }
 dependencies {
 snapshot(PublishLocal.publish_local)

diff --git a/.teamcity/generated/PushLocalWindows1809.kts b/.teamcity/generated/PushLocalWindows1809.kts
@@ -240,8 +240,7 @@ params {
 param("system.teamcity.agent.ensure.free.space", "43gb")
 }
 requirements {
-contains("system.agent.name", "docker")
-contains("system.agent.name", "windows10")
+contains("teamcity.agent.jvm.os.name", "Windows 10")
 }
 })
 
diff --git a/.teamcity/generated/PushLocalWindows2004.kts b/.teamcity/generated/PushLocalWindows2004.kts
@@ -240,8 +240,7 @@ params {
 param("system.teamcity.agent.ensure.free.space", "43gb")
 }
 requirements {
-contains("system.agent.name", "docker")
-contains("system.agent.name", "windows10")
+contains("teamcity.agent.jvm.os.name", "Windows 10")
 }
 })
 
diff --git a/tool/TeamCity.Docker/DockerGraphFactory.cs b/tool/TeamCity.Docker/DockerGraphFactory.cs
@@ -94,7 +94,22 @@ public Result<IGraph<IArtifact, Dependency>> Create(IEnumerable<Template> templa
                                     var values = expression.Split(" ");
                                     if (values.Length >= 2 && Enum.TryParse<RequirementType>(values[1], true, out var requirementType))
                                     {
-                                        requirements.Add(new Requirement(values[0], requirementType, values.Length > 2 ? values[2] : string.Empty));
+                                        // todo: simplify/improve this code, my C#-fu is poor
+                                        if (values.Length > 2)
+                                        {
+                                            if (values.Length > 3)
+                                            {
+                                                requirements.Add(new Requirement(values[0], requirementType, values[2] + " " + values[3]));
+                                            }
+                                            else
+                                            {
+                                                requirements.Add(new Requirement(values[0], requirementType, values[2]));
+                                            }
+                                        }
+                                        else
+                                        {
+                                            requirements.Add(new Requirement(values[0], requirementType, string.Empty));
+                                        }
                                     }
                                 });
                         }