Merge branch 'main' into new-pixi-install

Deltares · May 6, 2024 · 7e6e476 · 7e6e476
2 parents 555c635 + ffc210b
commit 7e6e476
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml
@@ -16,8 +16,7 @@
 source /usr/share/Modules/init/bash
 
 module load pixi
-pixi --version
-pixi run install-python]]></param>
+pixi --version]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml
@@ -6,6 +6,9 @@
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output_api.zip&#xA;ribasim\build\tests\temp =&gt; test_output_cli.zip" />
     </options>
+    <disabled-settings>
+      <setting-ref ref="RUNNER_1501" />
+    </disabled-settings>
     <parameters />
     <build-runners>
       <runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">