Resolve merge conflicts.

JetBrains · Dec 13, 2022 · 356a445 · 356a445
2 parents f402af8 + 0067984
commit 356a445
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/.teamcity/generated/PushHubWindows.kts b/.teamcity/generated/PushHubWindows.kts
@@ -259,11 +259,10 @@ object push_hub_windows: BuildType({
 	 	 contains("system.agent.name", "docker")
 	 	 contains("system.agent.name", "windows10")
 	 }
-		 dependencies {
-			 snapshot(PublishLocal.publish_local) {
-
-				 onDependencyFailure =  FailureAction.FAIL_TO_START 
- 		 }
-		 }
+	dependencies {
+		snapshot(PublishLocal.publish_local) {
+			onDependencyFailure =  FailureAction.FAIL_TO_START 
+		}
+	}
 })
 
diff --git a/configs/windows/Agent/windowsservercore/WindowsServerCore1803.Dockerfile b/configs/windows/Agent/windowsservercore/WindowsServerCore1803.Dockerfile
@@ -20,7 +20,7 @@
 # Platform ${windowsPlatform}
 # Repo ${repo}
 # Weight 16
-# Requires system.agent.name contains windows10
+# Requires teamcity.agent.jvm.os.name contains Windows 10
 
 ## ${agentCommentHeader}
 

diff --git a/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile b/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile
@@ -11,8 +11,7 @@
 # Platform ${windowsPlatform}
 # Repo ${repo}
 # Weight 5
-# Requires system.agent.name contains docker
-# Requires system.agent.name contains windows10
+# Requires teamcity.agent.jvm.os.name contains Windows 10
 
 ## ${agentCommentHeader}
 

diff --git a/configs/windows/Server/nanoserver/NanoServer1809.Dockerfile b/configs/windows/Server/nanoserver/NanoServer1809.Dockerfile
@@ -14,8 +14,7 @@
 # Platform ${windowsPlatform}
 # Repo ${repo}
 # Weight 3
-# Requires system.agent.name contains docker
-# Requires system.agent.name contains windows10
+# Requires teamcity.agent.jvm.os.name contains Windows 10
 
 ## ${serverCommentHeader}
 

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));
+                                        }
                                     }
                                 });
                         }