check if build-tools can run on 21

apache · Oct 25, 2023 · 73762b8 · 73762b8
1 parent 3b683d4
commit 73762b8
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -816,7 +816,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '11', '21' ]
     steps:
 
       - name: Set up JDK ${{ matrix.java }}
@@ -842,70 +842,93 @@ jobs:
       - name: java/java.mx.project
         continue-on-error: ${{ github.event_name != 'pull_request' }}
         run: .github/retry.sh ant $OPTS -f java/java.mx.project test
-
-      - name: java/gradle.java
-        run: .github/retry.sh ant $OPTS -f java/gradle.java test
-
-      - name: extide/gradle
-        run: ant $OPTS -f extide/gradle test
 
       - name: java/maven
+        if: always()
         run: ant $OPTS -f java/maven test
 
       - name: java/maven.embedder
+        if: always()
         run: ant $OPTS -f java/maven.embedder test
 
       - name: java/maven.grammar
+        if: always()
         run: ant $OPTS -f java/maven.grammar test
 
       - name: java/maven.hints
+        if: always()
         run: ant $OPTS -f java/maven.hints test
 
 #      - name: java/maven.htmlui
 #        run: ant $OPTS -f java/maven.htmlui test
 
       - name: java/maven.indexer
+        if: always()
         run: ant $OPTS -f java/maven.indexer test
 
       - name: java/maven.junit
+        if: always()
         run: ant $OPTS -f java/maven.junit test
 
       - name: java/maven.model
+        if: always()
         run: ant $OPTS -f java/maven.model test
 
       - name: java/maven.osgi
+        if: always()
         run: ant $OPTS -f java/maven.osgi test
 
       - name: java/api.maven
+        if: always()
         run: ant $OPTS -f java/api.maven test
 
       - name: maven.apisupport
+        if: always()
         run: ant $OPTS -f apisupport/maven.apisupport test
 
       - name: java/hudson.maven
+        if: always()
         run: ant $OPTS -f java/hudson.maven test
 
       - name: ide/project.ant
+        if: always()
         run: ant $OPTS -f ide/project.ant test
 
       - name: ide/project.ant.compat8
+        if: always()
         run: ant $OPTS -f ide/project.ant.compat8 test
 
       - name: ide/project.ant.ui
+        if: always()
         run: ant $OPTS -f ide/project.ant.ui test
 
 #      - name: java/ant.debugger
 #        run: ant $OPTS -f java/ant.debugger test
 
       - name: java/ant.freeform
+        if: always()
         run: ant $OPTS -f java/ant.freeform test
 
 #      - name: java/ant.grammar
 #        run: ant $OPTS -f java/ant.grammar test
 
       - name: extide/o.apache.tools.ant.module
+        if: always()
         run: ant $OPTS -f extide/o.apache.tools.ant.module test
 
+      - name: Set up JDK 17 for JDK 21 incompatible tests
+        if: ${{ matrix.java == '21' }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: ${{ env.default_java_distribution }}
+
+      - name: java/gradle.java
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        run: ant $OPTS -f extide/gradle test
+
       - name: Create Test Summary
         uses: test-summary/action@v2
         if: failure()