From 20fa752ed1a772dcf1e1c404df9f01c594bcd3b7 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Sat, 21 Sep 2024 17:16:54 +0200 Subject: [PATCH] Fix mill version detection --- project-builder/mill/prepare-project.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/project-builder/mill/prepare-project.sh b/project-builder/mill/prepare-project.sh index 6c1082eb..9a08f0bb 100755 --- a/project-builder/mill/prepare-project.sh +++ b/project-builder/mill/prepare-project.sh @@ -43,8 +43,18 @@ else for v in $MILL_0_12 $MILL_0_11 $MILL_0_10 $MILL_0_9; do if `${scriptDir}/millw --mill-version $v $RESOLVE > /dev/null 2>/dev/null`; then echo "Successfully applied build using mill $v" - millVersion=$v - break + buildScVersions=($MILL_0_11 $MILL_0_10 $MILL_0_9) + if [[ " ${buildScVersions[*]} " =~ " ${v} " && -f ./build.sc ]]; then + echo "Found build.sc file and matching Mill version" + millVersion=$v + break + elif [[ -f ./build.mill ]]; then + echo "Found build.mill file" + millVersion=$v + break + else + echo "Able to resolve build, but not found matching build files" + fi else echo "Failed to apply build using mill $v" fi