Merge branch 'main' into allocation_beyond_max_flow

Deltares · Oct 19, 2023 · 74452cb · 74452cb
2 parents fd7e33e + 26d90a6
commit 74452cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/BuildRibasimCliWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/BuildRibasimCliWindows.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="build/create_binaries/ribasim_cli =&gt; ribasim_cli.zip" />
+      <option name="artifactRules" value="ribasim\build/create_binaries/ribasim_cli =&gt; ribasim_cli.zip" />
       <option name="executionTimeoutMin" value="120" />
       <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
@@ -24,7 +24,7 @@
       <runner id="RUNNER_2420" name="Build binary" type="simpleRunner">
         <parameters>
           <param name="script.content"><![CDATA[set Path=d:\ProgramData\julia/julia-1.9.0/bin/;%env.Path%
-pixi run build-libribasim]]></param>
+pixi run build-ribasim-cli]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -33,14 +33,16 @@ pixi run build-libribasim]]></param>
       <runner id="RUNNER_1932" name="Get version from Ribasim" type="simpleRunner">
         <parameters>
           <param name="script.content" value="ribasim --version" />
-          <param name="teamcity.build.workingDir" value="build/create_binaries/ribasim_cli" />
+          <param name="teamcity.build.workingDir" value="ribasim/build/create_binaries/ribasim_cli" />
           <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_Ribasim" />
+      <vcs-entry-ref root-id="Ribasim_Ribasim_Ribasim">
+        <checkout-rule rule=". =&gt; ribasim" />
+      </vcs-entry-ref>
     </vcs-settings>
     <requirements>
       <equals id="RQ_275" name="env.OS" value="Windows_NT" />

diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_RibasimJl_BuildLibribasimWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_RibasimJl_BuildLibribasimWindows.xml
@@ -4,7 +4,7 @@
   <description />
   <settings>
     <options>
-      <option name="artifactRules" value="build\create_binaries\libribasim =&gt; libribasim.zip" />
+      <option name="artifactRules" value="ribasim\build\create_binaries\libribasim =&gt; libribasim.zip" />
       <option name="executionTimeoutMin" value="120" />
       <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
@@ -35,7 +35,9 @@ pixi run build-libribasim]]></param>
       </runner>
     </build-runners>
     <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim_Ribasim" />
+      <vcs-entry-ref root-id="Ribasim_Ribasim_Ribasim">
+        <checkout-rule rule=". =&gt; ribasim" />
+      </vcs-entry-ref>
     </vcs-settings>
     <requirements>
       <equals id="RQ_275" name="env.OS" value="Windows_NT" />