Merge main.

Deltares · May 16, 2024 · dc1a748 · dc1a748
2 parents ed9faa9 + 9baad56
commit dc1a748
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestDelwaqCoupling.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestDelwaqCoupling.xml
@@ -12,6 +12,15 @@
           <param name="use.custom.script" value="true" />
         </parameters>
       </runner>
+      <runner id="Run_Delwaq" name="Run Delwaq" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[pixi run install
+set D3D_HOME=%teamcity.build.checkoutDir%/dimr
+pixi run delwaq]]></param>
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
     </build-runners>
     <vcs-settings />
     <requirements />

diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimBinaries.xml
@@ -19,8 +19,8 @@
       <runner id="RUNNER_1503" name="Run tests" type="simpleRunner">
         <parameters>
           <param name="script.content"><![CDATA[pixi run install
-set D3D_HOME=%teamcity.build.checkoutDir%/dimr
-pixi run delwaq]]></param>
+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" />
           <param name="use.custom.script" value="true" />