reverting...

com-lihaoyi · Jan 12, 2025 · c930eda · c930eda
1 parent 7e6d6ca
commit c930eda
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 15 deletions.
diff --git a/.github/actions/post-build-setup/action.yml b/.github/actions/post-build-setup/action.yml
@@ -14,8 +14,10 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - run: echo temurin:${{ inputs.java-version }} > .mill-jvm-version
-      shell: bash
+    - uses: actions/setup-java@v4
+      with:
+        java-version: ${{ inputs.java-version }}
+        distribution: temurin
 
     # Need to fix cached artifact file permissions because github actions screws it up
     # https://github.com/actions/upload-artifact/issues/38

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
@@ -30,15 +30,11 @@ jobs:
         with:
           ref: ${{ github.base_ref }}
 
-      - run: echo temurin:${{ inputs.java-version }} > .mill-jvm-version
-
       - run: chmod -R 777 . # normalize permissions before and after upload/download-artifact
 
       - run: mkdir out && touch out/mill-selective-execution.json
         shell: bash
 
-      - run: cat .mill-jvm-version
-
       - run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
         if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
 

diff --git a/.github/workflows/publish-artifacts.yml b/.github/workflows/publish-artifacts.yml
@@ -33,7 +33,10 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-      - run: "echo temurin:11 > .mill-jvm-version"
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
 
       - run: ./mill -i __.publishArtifacts
 
@@ -78,7 +81,10 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-      - run: "echo temurin:11 > .mill-jvm-version"
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
 
       - run: ./mill -i mill.scalalib.PublishModule/
 
@@ -113,7 +119,10 @@ jobs:
       - uses: actions/checkout@v4
         with: { fetch-depth: 0 }
 
-      - run: "echo temurin:11 > .mill-jvm-version"
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
 
       - run: ./mill -i mill.scalalib.PublishModule/ --publishArtifacts dist.native.publishArtifacts
 
@@ -142,6 +151,9 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-      - run: "echo temurin:11 > .mill-jvm-version"
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
 
       - run: ./mill -i dist.uploadToGithub --authKey $REPO_ACCESS_TOKEN
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -27,6 +27,9 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-      - run: "echo temurin:11 > .mill-jvm-version"
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
 
       - run: ci/publish-docs.sh
diff --git a/integration/feature/launcher-old-versions/src/LauncherOldVersionsTests.scala b/integration/feature/launcher-old-versions/src/LauncherOldVersionsTests.scala
@@ -21,13 +21,28 @@ class LauncherOldVersionsTests(version: String) extends UtestIntegrationTestSuit
 
       // Run Mill once beforehand just to make sure it gets initialized and
       // none of the initialization output gets into `outText`
-      os.call(cmd = (launcherScript, "version"), cwd = workspacePath, stderr = os.Pipe)
+      os.call(
+        cmd = (launcherScript, "version"),
+        cwd = workspacePath,
+        stderr = os.Pipe,
+        env = Map("MILL_VERSION" -> version)
+      )
 
-      val res = os.call(cmd = (launcherScript, "version"), cwd = workspacePath, stderr = os.Pipe)
+      val res = os.call(
+        cmd = (launcherScript, "version"),
+        cwd = workspacePath,
+        stderr = os.Pipe,
+        env = Map("MILL_VERSION" -> version)
+      )
 
       val outText = res.out.text().trim
       assert(outText == version)
-      os.call(cmd = (launcherScript, "shutdown"), cwd = workspacePath, check = false)
+      os.call(
+        cmd = (launcherScript, "shutdown"),
+        cwd = workspacePath,
+        check = false,
+        env = Map("MILL_VERSION" -> version)
+      )
       os.remove.all(workspacePath / "out")
     }
   }
@@ -47,4 +62,3 @@ class LauncherOldVersionsTests(version: String) extends UtestIntegrationTestSuit
 //object LauncherVersionTests_0_9 extends LauncherOldVersionsTests("0.9.12")
 //object LauncherVersionTests_0_10 extends LauncherOldVersionsTests("0.10.15")
 object LauncherVersionTests_0_11 extends LauncherOldVersionsTests("0.11.13")
-//object LauncherVersionTests_0_12 extends LauncherOldVersionsTests("0.12.5")