Merge branch 'main' into compound_condition_variables

Deltares · Apr 16, 2024 · e6d42e4 · e6d42e4
2 parents 267d412 + b956f00
commit e6d42e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="7bd3078e-0f15-487c-b9d6-dd3417d60fe6" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_api</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux_Build">
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/libribasim_test_env" />
@@ -40,11 +39,7 @@ pixi run test-ribasim-api]]></param>
         </parameters>
       </runner>
     </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
+    <vcs-settings />
     <requirements>
       <does-not-equal id="RQ_315" name="env.OS" value="Windows_NT" />
     </requirements>
@@ -74,14 +69,6 @@ pixi run test-ribasim-api]]></param>
       </build-trigger>
     </build-triggers>
     <build-extensions>
-      <extension id="BUILD_EXT_142" 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>
       <extension id="BUILD_EXT_145" type="xml-report-plugin">
         <parameters>
           <param name="xmlReportParsing.reportDirs" value="ribasim/report.xml" />

diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="33150291-268d-4891-8743-ff91dc4e2ba4" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux_Build">
     <options>
       <option name="artifactRules" value="ribasim\build\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/ribasim_cli_test_env" />
@@ -40,11 +39,7 @@ pixi run test-ribasim-cli]]></param>
         </parameters>
       </runner>
     </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
+    <vcs-settings />
     <requirements>
       <does-not-equal id="RQ_310" name="env.OS" value="Windows_NT" />
     </requirements>
@@ -74,14 +69,6 @@ pixi run test-ribasim-cli]]></param>
       </build-trigger>
     </build-triggers>
     <build-extensions>
-      <extension id="BUILD_EXT_142" 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>
       <extension id="BUILD_EXT_145" type="xml-report-plugin">
         <parameters>
           <param name="xmlReportParsing.reportDirs" value="ribasim/report.xml" />
@@ -108,3 +95,4 @@ pixi run test-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
+