bugfix: Fix mill script on fish (#3700)

Also fix writeNativeImageScript issues with empty quotes and add test

Author: tgodzik

.github/scripts/generate-native-image.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-COMMAND="cli[].base-image.writeNativeImageScript"
+COMMAND="cli[].base-image.writeDefaultNativeImageScript"
 
 # temporary, until we pass JPMS options to native-image,
 # see https://www.graalvm.org/release-notes/22_2/#native-image
@@ -19,7 +19,7 @@ if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
   MAX_RETRIES=5
   RETRY_COUNT=0
   while (( RETRY_COUNT < MAX_RETRIES )); do
-      ./mill.bat -i "$COMMAND" generate-native-image.bat ""
+      ./mill.bat -i "$COMMAND" generate-native-image.bat
 
       if [[ $? -ne 0 ]]; then
           echo "Error occurred during 'mill.bat -i $COMMAND generate-native-image.bat' command. Retrying... ($((RETRY_COUNT + 1))/$MAX_RETRIES)"
@@ -45,19 +45,19 @@ if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
 else
   if [ $# == "0" ]; then
     if [[ "$OSTYPE" == "linux-gnu" ]]; then
-      COMMAND="cli[].linux-docker-image.writeNativeImageScript"
+      COMMAND="cli[].linux-docker-image.writeDefaultNativeImageScript"
       CLEANUP=("sudo" "rm" "-rf" "out/cli/linux-docker-image/nativeImageDockerWorkingDir")
     else
       CLEANUP=("true")
     fi
   else
     case "$1" in
       "static")
-        COMMAND="cli[].static-image.writeNativeImageScript"
+        COMMAND="cli[].static-image.writeDefaultNativeImageScript"
         CLEANUP=("sudo" "rm" "-rf" "out/cli/static-image/nativeImageDockerWorkingDir")
         ;;
       "mostly-static")
-        COMMAND="cli[].mostly-static-image.writeNativeImageScript"
+        COMMAND="cli[].mostly-static-image.writeDefaultNativeImageScript"
         CLEANUP=("sudo" "rm" "-rf" "out/cli/mostly-static-image/nativeImageDockerWorkingDir")
         ;;
       *)
@@ -67,7 +67,7 @@ else
     esac
   fi
 
-  ./mill -i "$COMMAND" generate-native-image.sh ""
+  ./mill -i "$COMMAND" --scriptDest generate-native-image.sh
   bash ./generate-native-image.sh
   "${CLEANUP[@]}"
 fi

.github/workflows/ci.yml

@@ -51,6 +51,26 @@ jobs:
         name: test-results-unit-tests
         path: test-report.xml
 
+  test-fish-shell:
+    timeout-minutes: 120
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: VirtusLab/scala-cli-setup@v1
+      with:
+        jvm: "temurin:17"
+    - name: Install fish
+      run: |
+        sudo apt-add-repository ppa:fish-shell/release-3
+        sudo apt update
+        sudo apt install fish
+    - name: Test mill script in fish shell
+      run: |
+        fish -c './mill __.compile'
+
   jvm-tests-1:
     timeout-minutes: 120
     runs-on: ubuntu-24.04

mill

@@ -3,6 +3,10 @@
 # Adapted from
 
 coursier_version="2.1.24"
+COMMAND=$@
+
+# necessary for Windows various shell environments
+IS_WINDOWS=$(uname | grep -E 'CYG*|MSYS*|MING*|UCRT*|ClANG*|GIT*')
 
 # https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux/17072017#17072017
 if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then
@@ -64,8 +68,7 @@ function to_bash_syntax {
     echo "$S" | sed -E -e 's#^set #export #' -e 's#%([A-Z_][A-Z_0-9]*)%#${\1}#g' | tr '\\' '/'
   done
 }
-# necessary for Windows various shell environments
-if [[ `uname | grep -E 'CYG*|MSYS*|MING*|UCRT*|ClANG*|GIT*'` ]]; then
+if [[ $IS_WINDOWS ]]; then
   # needed for coursier version < 2.1.8, harmless otherwise
   IFS=$'\n'
   eval "$(to_bash_syntax `"$cs" java --env --jvm temurin:17` || to_bash_syntax `"$cs" java --env --jvm openjdk:1.17.0`)"
@@ -80,4 +83,8 @@ export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 
-exec "$DIR/millw" "$@"
+if [[ $IS_WINDOWS ]]; then
+  exec "$DIR/millw" "$@"
+else
+  exec "$DIR/millw" $COMMAND
+fi

project/settings.sc

@@ -160,6 +160,11 @@ trait CliLaunchers extends SbtModule { self =>
   def defaultFilesResourcePath = os.rel / "scala" / "cli" / "commands" / "publish"
 
   trait CliNativeImage extends NativeImage {
+
+    def writeDefaultNativeImageScript(scriptDest: String) = T.command {
+      super.writeNativeImageScript(scriptDest, "")()
+    }
+
     def launcherKind: String
     def nativeImageCsCommand    = Seq(cs())
     def nativeImagePersist      = System.getenv("CI") != null
@@ -363,9 +368,9 @@ trait CliLaunchers extends SbtModule { self =>
         .call(cwd = os.pwd / "project" / "musl-image", stdout = os.Inherit)
       ()
     }
-    def writeNativeImageScript(scriptDest: String, imageDest: String = "") = T.command {
+    override def writeDefaultNativeImageScript(scriptDest: String) = T.command {
       buildHelperImage()
-      super.writeNativeImageScript(scriptDest, imageDest)()
+      super.writeDefaultNativeImageScript(scriptDest)()
     }
   }