Ensure the -i option is always respected and passed first for all `…

…./mill` calls
VirtusLab · Nov 10, 2023 · f3ab0e8 · f3ab0e8
1 parent 7a65b8e
commit f3ab0e8
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 68 deletions.
diff --git a/.github/scripts/build-linux-aarch64-from-docker.sh b/.github/scripts/build-linux-aarch64-from-docker.sh
@@ -13,6 +13,6 @@ git config --global --add safe.directory "$(pwd)"
 
 ./mill -i show cli.nativeImage
 ./mill -i copyDefaultLauncher ./artifacts
-if "true" == $(./mill -i ci.shouldPublish); then
+if "true" == $(./mill -i --disable-callgraph-invalidation ci.shouldPublish); then
   .github/scripts/generate-os-packages.sh
 fi
diff --git a/.github/scripts/generate-native-image.sh b/.github/scripts/generate-native-image.sh
@@ -10,12 +10,12 @@ export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
 # Using 'mill -i' so that the Mill process doesn't outlive this invocation
 
 if [[ "$OSTYPE" == "msys" ]]; then
-  ./mill.bat -i ci.copyJvm --dest jvm
+  ./mill.bat -i --disable-callgraph-invalidation ci.copyJvm --dest jvm
   export JAVA_HOME="$(pwd -W | sed 's,/,\\,g')\\jvm"
   export GRAALVM_HOME="$JAVA_HOME"
   export PATH="$(pwd)/bin:$PATH"
   echo "PATH=$PATH"
-  ./mill.bat -i "$COMMAND" generate-native-image.bat ""
+  ./mill.bat -i --disable-callgraph-invalidation "$COMMAND" generate-native-image.bat ""
   ./generate-native-image.bat
 else
   if [ $# == "0" ]; then
@@ -42,7 +42,7 @@ else
     esac
   fi
 
-  ./mill -i "$COMMAND" generate-native-image.sh ""
+  ./mill -i --disable-callgraph-invalidation "$COMMAND" generate-native-image.sh ""
   bash ./generate-native-image.sh
   "${CLEANUP[@]}"
 fi
diff --git a/.github/scripts/generate-os-packages.sh b/.github/scripts/generate-os-packages.sh
@@ -21,7 +21,7 @@ else
 fi
 
 packager() {
-  "$mill" -i packager.run "$@"
+  "$mill" -i --disable-callgraph-invalidation packager.run "$@"
 }
 
 launcher() {
@@ -34,17 +34,17 @@ launcher() {
     launcherName="scala"
   fi
 
-  "$mill" -i copyTo "$launcherMillCommand" "$launcherName" 1>&2
+  "$mill" -i --disable-callgraph-invalidation copyTo "$launcherMillCommand" "$launcherName" 1>&2
   echo "$launcherName"
 }
 
 version() {
-  "$mill" -i writePackageVersionTo scala-cli-version 1>&2
+  "$mill" -i --disable-callgraph-invalidation writePackageVersionTo scala-cli-version 1>&2
   cat scala-cli-version
 }
 
 shortVersion() {
-  "$mill" -i writeShortPackageVersionTo scala-cli-short-version 1>&2
+  "$mill" -i --disable-callgraph-invalidation writeShortPackageVersionTo scala-cli-short-version 1>&2
   cat scala-cli-short-version
 }
 

diff --git a/.github/scripts/generate-slim-docker-image.sh b/.github/scripts/generate-slim-docker-image.sh
@@ -5,7 +5,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 WORKDIR="$ROOT/out/docker-slim-workdir"
 
 mkdir -p "$WORKDIR"
-./mill -i copyTo cli.nativeImageMostlyStatic "$WORKDIR/scala-cli" 1>&2
+./mill -i --disable-callgraph-invalidation copyTo cli.nativeImageMostlyStatic "$WORKDIR/scala-cli" 1>&2
 
 cd "$WORKDIR"
 docker build -t scala-cli-slim -f "$ROOT/.github/scripts/docker/ScalaCliSlimDockerFile" .
diff --git a/.github/scripts/publish-docker-images.sh b/.github/scripts/publish-docker-images.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-SCALA_CLI_VERSION="$(./mill -i ci.publishVersion)"
+SCALA_CLI_VERSION="$(./mill -i --disable-callgraph-invalidation ci.publishVersion)"
 
 docker tag scala-cli virtuslab/scala-cli:latest
 docker tag scala-cli virtuslab/scala-cli:"$SCALA_CLI_VERSION"

diff --git a/.github/scripts/publish-slim-docker-images.sh b/.github/scripts/publish-slim-docker-images.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-SCALA_CLI_VERSION="$(./mill -i ci.publishVersion)"
+SCALA_CLI_VERSION="$(./mill -i --disable-callgraph-invalidation ci.publishVersion)"
 
 docker tag scala-cli-slim virtuslab/scala-cli-slim:latest
 docker tag scala-cli-slim virtuslab/scala-cli-slim:"$SCALA_CLI_VERSION"