Set julia_dir

Deltares · Nov 10, 2023 · 6a71264 · 6a71264
1 parent 4388d98
commit 6a71264
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/BuildRibasimCliWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/BuildRibasimCliWindows.xml
@@ -9,8 +9,7 @@
       <option name="executionTimeoutMin" value="120" />
     </options>
     <parameters>
-      <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/env_build_ribasim_cli" />
-      <param name="julia" value="%env.JULIA_1_10%" />
+      <param name="julia_dir" value="%env.JULIA_DIR_1_10%" />
     </parameters>
     <build-runners>
       <runner id="RUNNER_2418" name="Set up pixi" type="simpleRunner">
@@ -23,8 +22,8 @@
       </runner>
       <runner id="RUNNER_2420" name="Build binary" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[set Path=%env.JULIA_DIR_1_9%;%env.Path%
-pixi run build-ribasim-cli]]></param>
+          <param name="script.content"><![CDATA[set Path=%julia_dir%;%env.Path%
+            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" />
@@ -91,4 +90,3 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
-
diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_RibasimJl_BuildLibribasimWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_RibasimJl_BuildLibribasimWindows.xml
@@ -13,18 +13,9 @@
       <setting-ref ref="RQ_271" />
     </disabled-settings>
     <parameters>
-      <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/env_build_libribasim" />
-      <param name="julia" value="%env.JULIA_1_10%" />
+      <param name="julia_dir" value="%env.JULIA_DIR_1_10%" />
     </parameters>
     <build-runners>
-      <runner id="RUNNER_2427" name="Print versions" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[%env.JULIA_1_9% --version
-pixi --version]]></param>
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
       <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
         <parameters>
           <param name="script.content" value="pixi run install-without-pre-commit" />
@@ -35,7 +26,7 @@ pixi --version]]></param>
       </runner>
       <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[set Path=%env.JULIA_DIR_1_9%;%env.Path%
+          <param name="script.content"><![CDATA[set Path=%julia_dir%;%env.Path%
 pixi run build-libribasim]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
@@ -90,4 +81,3 @@ pixi run build-libribasim]]></param>
     <cleanup />
   </settings>
 </build-type>
-