Fix running mill projects

VirtusLab · Jan 3, 2024 · c7ad683 · c7ad683
1 parent f384e60
commit c7ad683
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project-builder/mill/build.sh b/project-builder/mill/build.sh
@@ -44,7 +44,7 @@ millSettings=(
 function tryBuild() {
   mill=$1
   echo "Try build using $mill"
-  $mill ${millSettings[@]} runCommunityBuild "$scalaVersion" "${projectConfig}" "${targets[@]}"
+  $mill "${millSettings[@]}" runCommunityBuild "$scalaVersion" "${projectConfig}" "${targets[@]}"
 }
 
 

diff --git a/project-builder/mill/prepare-project.sh b/project-builder/mill/prepare-project.sh
@@ -30,7 +30,7 @@ if [[ -f .mill-version ]];then
 else
   echo "No .mill-version file found, detecting compatible mill version"
   if [[ -f ./mill ]];then
-    millVersion=`./mill -v resolve _ | grep "[Mm]ill.*version" | grep -E -o "(\d+\.?){3}"`
+    millVersion=`./mill -v $RESOLVE | grep "[Mm]ill.*version" | grep -E -o "(\d+\.?){3}"`
   else 
     for v in $MILL_0_11 $MILL_0_10 $MILL_0_9; do
       if ${scriptDir}/millw --mill-version $v $RESOLVE > /dev/null 2>/dev/null; then