From c7ad683fe07007ed9bd58c32277a2f7b81c613aa Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Wed, 3 Jan 2024 22:02:40 +0100 Subject: [PATCH] Fix running mill projects --- project-builder/mill/build.sh | 2 +- project-builder/mill/prepare-project.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project-builder/mill/build.sh b/project-builder/mill/build.sh index a3d299c8..979323bf 100755 --- 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 index e4a7daf8..97fdd060 100755 --- 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