Try to fix Windows CI error with setup-graalvm

com-lihaoyi · Dec 2, 2024 · a71dacd · a71dacd
1 parent a88c5c1
commit a71dacd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/.github/workflows/run-mill-action.yml b/.github/workflows/run-mill-action.yml
@@ -12,6 +12,9 @@ on:
       java-version:
         required: true
         type: string
+      use-graalvm:
+        default: false
+        type: boolean
       os:
         default: 'ubuntu-latest'
         type: string
@@ -60,6 +63,13 @@ jobs:
         with:
           java-version: ${{ inputs.java-version }}
           distribution: temurin
+        if: !inputs.use-graalvm
+
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: ${{ inputs.java-version }}
+          distribution: graalvm-community
+        if: inputs.use-graalvm
 
       - uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -134,20 +134,27 @@ jobs:
           # just run a subset of examples/ on Windows, because for some reason running
           # the whole suite can take hours on windows v.s. half an hour on linux
           - java-version: '11'
+            use-graalvm: false
             millargs: '"{main,scalalib,bsp}.__.testCached"'
           - java-version: '11'
+            # native-client requires MSVC build tools to be configured for x86
+            use-graalvm: true
             millargs: '"example.scalalib.basic.__.fork.testCached"'
           - java-version: 17
+            use-graalvm: false
             millargs: "'integration.{feature,failure}[_].fork.testCached'"
           - java-version: '11'
+            use-graalvm: false
             millargs: "'integration.invalidation[_].server.testCached'"
           - java-version: '11'
+            use-graalvm: false
             millargs: "contrib.__.testCached"
 
     uses: ./.github/workflows/run-mill-action.yml
     with:
       os: windows-latest
       java-version: ${{ matrix.java-version }}
+      use-graalvm: ${{ matrix.use-graalvm }}
       millargs: ${{ matrix.millargs }}
 
   itest: