Update build matrix.

raphw · raphw · commit a9603b49d746 · 2021-11-07T21:12:14.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,49 +18,48 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
-          java-version: 17-ea
+          java-version: 18-ea
           distribution: temurin
           cache: maven
       - name: Install JDK and build project
-        run: ./mvnw verify -Pjava17
+        run: ./mvnw verify -Pjava18
         continue-on-error: false
-  any-supported:
+  hotspot-supported:
     name: Any (supported)
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macOS-10.15, windows-2019]
-        java: [8, 11]
-        distribution: [temurin, adopt-openj9]
+        java: [8, 11, 17]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: ${{ matrix.distribution }}
+          distribution: temurin
           architecture: x64
           cache: maven
       - name: Build project
         run: ./mvnw verify -Pintegration -Pjava${{ matrix.java }}
-  hotspot-32:
-    name: HotSpot (32 bit)
+  j9-supported:
+    name: Any (supported)
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-2019]
-        java: [8]
+        os: [ubuntu-18.04, macOS-10.15, windows-2019]
+        java: [8, 11]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: zulu
-          architecture: x86
+          distribution: adopt-openj9
+          architecture: x64
           cache: maven
       - name: Build project
-        run: ./mvnw verify "-Djapicmp.skip=true" -Pintegration -Pjava${{ matrix.java }}
+        run: ./mvnw verify -Pintegration -Pjava${{ matrix.java }}
   hotspot-unsupported:
     name: HotSpot (unsupported)
     strategy:
@@ -78,6 +77,24 @@ jobs:
           cache: maven
       - name: Build project
         run: ./mvnw verify -Pintegration -Pjava${{ matrix.java }}
+  hotspot-32:
+    name: HotSpot (32 bit)
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-18.04, windows-2019]
+        java: [8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: zulu
+          architecture: x86
+          cache: maven
+      - name: Build project
+        run: ./mvnw verify "-Djapicmp.skip=true" -Pintegration -Pjava${{ matrix.java }}
   hotspot-legacy:
     name: HotSpot (legacy)
     strategy:
