From 221155667a7c63164b17bf108b1411eb91888218 Mon Sep 17 00:00:00 2001
From: feng <feng@TeamCity>
Date: Tue, 16 Apr 2024 11:12:52 +0200
Subject: [PATCH 1/5] TeamCity change in 'Ribasim / Linux' project: 'Build'
 build template was extracted from 'Build libribasim' build configuration

---
 .../buildTypes/Ribasim_Linux_Build.xml        | 65 +++++++++++++++++++
 .../Ribasim_Linux_BuildLibribasim.xml         | 61 ++---------------
 2 files changed, 70 insertions(+), 56 deletions(-)
 create mode 100644 .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
new file mode 100644
index 000000000..50b575465
--- /dev/null
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="ba056ffa-f17b-4684-add1-3fcaee0c2a81" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Build</name>
+  <settings>
+    <options>
+      <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
+      <option name="cleanBuild" value="true" />
+      <option name="executionTimeoutMin" value="120" />
+      <option name="publishArtifactCondition" value="SUCCESSFUL" />
+    </options>
+    <parameters />
+    <build-runners>
+      <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[#!/bin/bash
+# black magic
+source /usr/share/Modules/init/bash
+
+module load pixi
+pixi --version
+pixi run --environment=dev install-ci]]></param>
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[#!/bin/bash
+# black magic
+source /usr/share/Modules/init/bash
+
+module load pixi
+module load gcc/11.3.0
+pixi run remove-artifacts
+pixi run build-libribasim]]></param>
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Ribasim_Ribasim">
+        <checkout-rule rule=". =&gt; ribasim" />
+      </vcs-entry-ref>
+    </vcs-settings>
+    <requirements>
+      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
+    </requirements>
+    <build-triggers />
+    <build-extensions>
+      <extension id="BUILD_EXT_295" type="commit-status-publisher">
+        <parameters>
+          <param name="github_authentication_type" value="token" />
+          <param name="github_host" value="https://api.github.com" />
+          <param name="publisherId" value="githubStatusPublisher" />
+          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
+        </parameters>
+      </extension>
+    </build-extensions>
+    <cleanup />
+  </settings>
+</template>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
index 411c2ddcf..3cda8935d 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
@@ -2,64 +2,13 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="cf391998-fed9-4a22-ae44-8877d1028c10" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build libribasim</name>
   <description />
-  <settings>
-    <options>
-      <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
-      <option name="cleanBuild" value="true" />
-      <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
-    </options>
+  <settings ref="Ribasim_Linux_Build">
     <parameters />
-    <build-runners>
-      <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/bin/bash
-# black magic
-source /usr/share/Modules/init/bash
-
-module load pixi
-pixi --version
-pixi run --environment=dev install-ci]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-      <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/bin/bash
-# black magic
-source /usr/share/Modules/init/bash
-
-module load pixi
-module load gcc/11.3.0
-pixi run remove-artifacts
-pixi run build-libribasim]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-    </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
-    <requirements>
-      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
-    </requirements>
+    <build-runners />
+    <vcs-settings />
+    <requirements />
     <build-triggers />
-    <build-extensions>
-      <extension id="BUILD_EXT_295" type="commit-status-publisher">
-        <parameters>
-          <param name="github_authentication_type" value="token" />
-          <param name="github_host" value="https://api.github.com" />
-          <param name="publisherId" value="githubStatusPublisher" />
-          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
-        </parameters>
-      </extension>
-    </build-extensions>
     <cleanup />
   </settings>
 </build-type>
+

From f70aaccb8a80afdd44e45fdeaf5e6f680f491855 Mon Sep 17 00:00:00 2001
From: feng <feng@TeamCity>
Date: Tue, 16 Apr 2024 11:33:25 +0200
Subject: [PATCH 2/5] TeamCity change in 'Ribasim / Linux' project:
 requirements of 'Build' build template were updated

---
 .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
index 50b575465..53027c4ec 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
@@ -46,7 +46,7 @@ pixi run build-libribasim]]></param>
       </vcs-entry-ref>
     </vcs-settings>
     <requirements>
-      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
+      <equals id="RQ_275" name="env.OS" value="Linux" />
     </requirements>
     <build-triggers />
     <build-extensions>

From 48a770e5b93bb1ccd2f092ad856cf3305be01835 Mon Sep 17 00:00:00 2001
From: feng <feng@TeamCity>
Date: Tue, 16 Apr 2024 11:34:06 +0200
Subject: [PATCH 3/5] TeamCity change in 'Ribasim / Linux' project:
 requirements of 'Build' build template were updated

---
 .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
index 53027c4ec..4be8aaa2d 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
@@ -46,7 +46,7 @@ pixi run build-libribasim]]></param>
       </vcs-entry-ref>
     </vcs-settings>
     <requirements>
-      <equals id="RQ_275" name="env.OS" value="Linux" />
+      <contains id="RQ_275" name="env.OS" value="Linux" />
     </requirements>
     <build-triggers />
     <build-extensions>

From 2b5f0bd9a14eabc8085a48f441b97bb49e774585 Mon Sep 17 00:00:00 2001
From: feng <feng@TeamCity>
Date: Tue, 16 Apr 2024 11:34:27 +0200
Subject: [PATCH 4/5] TeamCity change in 'Ribasim / Linux' project:
 requirements of 'Build' build template were updated

---
 .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
index 4be8aaa2d..50b575465 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
@@ -46,7 +46,7 @@ pixi run build-libribasim]]></param>
       </vcs-entry-ref>
     </vcs-settings>
     <requirements>
-      <contains id="RQ_275" name="env.OS" value="Linux" />
+      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
     <build-triggers />
     <build-extensions>

From 391129adb5070ffe5fe16fbf01753a5087e5ed5b Mon Sep 17 00:00:00 2001
From: feng <feng@TeamCity>
Date: Tue, 16 Apr 2024 11:40:56 +0200
Subject: [PATCH 5/5] TeamCity change in 'Ribasim / Linux' project:
 requirements of 'Build' build template were updated

---
 .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
index 50b575465..86ecc3d31 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
@@ -46,7 +46,7 @@ pixi run build-libribasim]]></param>
       </vcs-entry-ref>
     </vcs-settings>
     <requirements>
-      <does-not-equal id="RQ_275" name="env.OS" value="Windows_NT" />
+      <equals id="RQ_275" name="teamcity.agent.jvm.os.name" value="Linux" />
     </requirements>
     <build-triggers />
     <build-extensions>