Begin testing with latest Java (23 presently) and move OpenJ9 testing…

… to Semeru
jboss-remoting · Oct 15, 2024 · f94a323 · f94a323
1 parent 8ff937d
commit f94a323
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        jdk-distribution: [temurin, adopt-openj9]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        jdk-distribution: [temurin, semeru]
     steps:
     - name: Configure runner - Linux
       if: contains(matrix.os, 'ubuntu')
@@ -30,16 +30,17 @@ jobs:
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
     - uses: actions/checkout@v4
-    - name: Set up JDK ${{ matrix.jdk-distribution }} 21
+    - name: Set up JDKs
       uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.jdk-distribution }}
         java-version: |
           11
           17
           21
+          23
     - name: Run Tests
-      run: mvn -ntp -U -B -fae clean install "-Djava11.home=${{env.JAVA_HOME_11_X64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}"
+      run: mvn -ntp -U -B -fae clean install -Pjava21-test-classpath "-Djava11.home=${{env.JAVA_HOME_11_X64}}${{env.JAVA_HOME_11_ARM64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}" "-Djava21.home=${{env.JAVA_HOME_21_X64}}${{env.JAVA_HOME_21_ARM64}}"
     - uses: actions/upload-artifact@v4
       if: failure()
       with:

diff --git a/api/build-test-java21 b/api/build-test-java21
diff --git a/river/build-test-java21 b/river/build-test-java21
diff --git a/serial/build-test-java21 b/serial/build-test-java21
diff --git a/tests/build-test-java11 b/tests/build-test-java11
diff --git a/tests/build-test-java21 b/tests/build-test-java21
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -87,6 +87,20 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>java11-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*$*</exclude>
+                                <exclude>**/RecordTestFactory.*</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*TestFactory.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
                 <configuration>
                     <includes>
                         <include>**/*TestFactory.java</include>