Switches GitHub Actions over to Oracle's setup-java to get reliable a…

…ccess to EA versions
jqno · Oct 24, 2023 · d8d89e8 · d8d89e8
1 parent ff9893a
commit d8d89e8
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,37 +19,31 @@ jobs:
             experimental: false
             cache-id: "jdk8"
             java: 8
-            dist: temurin
             flags: ""
           - title: "Supported JDK 11"
             experimental: false
             cache-id: "jdk11"
             java: 11
-            dist: temurin
             flags: ""
           - title: "Supported JDK 17"
             experimental: false
             cache-id: "jdk17"
             java: 17
-            dist: temurin
             flags: ""
           - title: "Supported JDK 21"
             experimental: false
             cache-id: "jdk21"
             java: 21
-            dist: zulu
             flags: ""
           - title: "Experimental JDK EA (simplified)"
-            experimental: false
+            experimental: true
             cache-id: "jdk-ea-simple"
-            java: "22-ea"
-            dist: zulu
+            java: "EA"
             flags: "-Dexperimental -DdisableStaticAnalysis"
           - title: "Experimental JDK EA (full)"
             experimental: true
             cache-id: "jdk-ea-full"
-            java: "22-ea"
-            dist: zulu
+            java: "EA"
             flags: ""
     runs-on: ubuntu-latest
     steps:
@@ -69,10 +63,9 @@ jobs:
             ${{ runner.os }}-mvn-${{ matrix.cache-id }}
     - name: 'Set up JDK ${{ matrix.java }}'
       if: ${{ !(matrix.experimental && github.event_name == 'pull_request') }}
-      uses: actions/setup-java@v3
+      uses: oracle-actions/setup-java@v1
       with:
-          distribution: ${{ matrix.dist }}
-          java-version: ${{ matrix.java }}
+          release: ${{ matrix.java }}
     - name: 'Display JDK version'
       if: ${{ !(matrix.experimental && github.event_name == 'pull_request') }}
       run: java -version