Use JDK 21 Graal in the CI (#839)

jormundur00 · web-flow · commit 18446546f6e0 · 2026-02-25T08:05:30.000+01:00
diff --git a/.github/actions/prepare-environment/action.yml b/.github/actions/prepare-environment/action.yml
@@ -9,7 +9,11 @@ inputs:
   java-version:
     description: 'Java version to use'
     required: false
-    default: '17'
+    default: '17.0.12'
+  graal-java-version:
+    description: 'GraalVM Java version to use for tests (sets GRAALVM_HOME, leaves JAVA_HOME unchanged)'
+    required: false
+    default: '21'
   push-access:
     description: 'Does this workflow require push access?'
     required: false
@@ -22,12 +26,19 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: "🔧 Install GraalVM (JDK${{ inputs.java-version }})"
-      uses: graalvm/setup-graalvm@main
+    - name: "🔧 Install Gradle JDK (JDK${{ inputs.java-version }})"
+      uses: actions/setup-java@v4
       with:
+        distribution: 'graalvm'
         java-version: ${{ inputs.java-version }}
+    - name: "🔧 Install GraalVM for tests (JDK${{ inputs.graal-java-version }})"
+      if: ${{ inputs.graal-java-version != '' }}
+      uses: graalvm/setup-graalvm@main
+      with:
+        java-version: ${{ inputs.graal-java-version }}
         distribution: 'graalvm'
         github-token: ${{ inputs.github-token }}
+        set-java-home: 'false'
     - name: "🔒 Configure push access"
       if: ${{ inputs.push-access == '1' }}
       shell: "bash"
diff --git a/.github/workflows/deploy-documentation.yml b/.github/workflows/deploy-documentation.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁  Checkout repository"
diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁  Checkout repository"
diff --git a/.github/workflows/test-graalvm-metadata.yml b/.github/workflows/test-graalvm-metadata.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁️ Checkout repository"
diff --git a/.github/workflows/test-junit-platform-native.yml b/.github/workflows/test-junit-platform-native.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁️ Checkout repository"
diff --git a/.github/workflows/test-native-gradle-plugin.yml b/.github/workflows/test-native-gradle-plugin.yml
@@ -58,6 +58,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: '21'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "❓ Check and test the plugin"
         run: ./gradlew :native-gradle-plugin:functionalTest -DgradleVersion="${{ matrix.gradle-version }}" --tests ${{ matrix.test }}
@@ -103,6 +104,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: '21'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "❓ Check and test the plugin with configuration cache"
         run: ./gradlew :native-gradle-plugin:configCacheFunctionalTest -DgradleVersion="${{ matrix.gradle-config-cache-version }}" --tests ${{ matrix.test }}
@@ -120,7 +122,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁️ Checkout repository"
@@ -129,6 +131,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: '21'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "❓ Unit tests and inspections"
         run: ./gradlew :native-gradle-plugin:test :native-gradle-plugin:inspections
@@ -146,7 +149,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁️ Checkout repository"
@@ -155,6 +158,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: ''
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "🔧 Install GraalVM (dev)"
         uses: graalvm/setup-graalvm@main
diff --git a/.github/workflows/test-native-maven-plugin.yml b/.github/workflows/test-native-maven-plugin.yml
@@ -59,6 +59,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: '21'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "❓ Check and test the plugin"
         run: ./gradlew :native-maven-plugin:functionalTest --no-daemon --fail-fast --tests ${{ matrix.test }}
@@ -77,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17.0.12 ]
         os: [ ubuntu-22.04 ]
     steps:
       - name: "☁️ Checkout repository"
@@ -86,6 +87,7 @@ jobs:
         uses: ./.github/actions/prepare-environment
         with:
           java-version: ${{ matrix.java-version }}
+          graal-java-version: ''
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: "🔧 Install GraalVM (dev)"
         uses: graalvm/setup-graalvm@main
diff --git a/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle b/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle
@@ -1,7 +1,7 @@
 import groovy.json.JsonOutput
 
 def matrixDefault = [
-        "java-version": [ "17" ],
+        "java-version": [ "17.0.12" ],
         "os": [ "ubuntu-22.04", "windows-latest", "macos-latest" ]
 ]
 
diff --git a/samples/java-application-with-custom-packaging/pom.xml b/samples/java-application-with-custom-packaging/pom.xml
@@ -127,6 +127,12 @@
             <artifactId>jakarta.annotation-api</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import groovy.json.JsonOutput`
`2`	`2`
`3`	`3`	`def matrixDefault = [`
`4`		`- "java-version": [ "17" ],`
	`4`	`+ "java-version": [ "17.0.12" ],`
`5`	`5`	`"os": [ "ubuntu-22.04", "windows-latest", "macos-latest" ]`
`6`	`6`	`]`
`7`	`7`