Merge branch 'main' into stepping_over_events

Deltares · Apr 23, 2024 · bf12961 · bf12961
2 parents 3f0a53d + 94f36bc
commit bf12961
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimBinaries.xml
@@ -30,6 +30,7 @@ pixi run install-python]]></param>
 source /usr/share/Modules/init/bash
 
 module load pixi
+pixi run --environment=dev install
 pixi run test-ribasim-api
 pixi run test-ribasim-cli]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasim.xml
@@ -4,6 +4,7 @@
   <description />
   <settings ref="Ribasim_Windows">
     <options>
+      <option name="artifactRules" value="ribasim\build\ribasim =&gt; ribasim_windows.zip" />
       <option name="executionTimeoutMin" value="120" />
       <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
@@ -53,3 +54,4 @@ pixi run build]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml
@@ -18,7 +18,8 @@
       </runner>
       <runner id="RUNNER_1503" name="Run tests" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[pixi run test-ribasim-api
+          <param name="script.content"><![CDATA[pixi run --environment=dev install
+pixi run test-ribasim-api
 pixi run test-ribasim-cli]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />