20

mbien · Sep 1, 2024 · 2c73096 · 2c73096
1 parent cdd7f17
commit 2c73096
Showing 1 changed file with 285 additions and 47 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -817,10 +817,10 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'Ant') || contains(github.event.pull_request.labels.*.name, 'Gradle') || contains(github.event.pull_request.labels.*.name, 'Maven') || contains(github.event.pull_request.labels.*.name, 'MX') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
     needs: base-build
     runs-on: ubuntu-latest
-    timeout-minutes: 50
+    timeout-minutes: 120
     strategy:
       matrix:
-        java: [ '17', '21', '23-ea' ]
+        java: [ '17' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -845,67 +845,231 @@ jobs:
       - name: Extract
         run: tar --zstd -xf build.tar.zst
 
-      - name: java/maven
-        run: ant $OPTS -f java/maven test
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
 
-      - name: java/maven.embedder
-        run: ant $OPTS -f java/maven.embedder test
+############################
 
-      - name: java/maven.grammar
-        run: ant $OPTS -f java/maven.grammar test
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
-      - name: java/maven.hints
-        run: ant $OPTS -f java/maven.hints test
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
 
-#      - name: java/maven.htmlui
-#        run: ant $OPTS -f java/maven.htmlui test
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
 
-      - name: java/maven.indexer
-        run: ant $OPTS -f java/maven.indexer test
+############################
 
-      - name: java/maven.refactoring
-        run: ant $OPTS -f java/maven.refactoring test
+############################
 
-      - name: java/maven.junit
-        run: ant $OPTS -f java/maven.junit test
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
-      - name: java/maven.model
-        run: ant $OPTS -f java/maven.model test
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
 
-      - name: java/maven.osgi
-        run: ant $OPTS -f java/maven.osgi test
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
 
-      - name: java/api.maven
-        run: ant $OPTS -f java/api.maven test
+############################
 
-      - name: maven.apisupport
-        run: ant $OPTS -f apisupport/maven.apisupport test
+############################
 
-      - name: java/hudson.maven
-        run: ant $OPTS -f java/hudson.maven test
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
-      - name: ide/project.ant
-        run: ant $OPTS -f ide/project.ant test
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
 
-      - name: ide/project.ant.compat8
-        run: ant $OPTS -f ide/project.ant.compat8 test
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
 
-      - name: ide/project.ant.ui
-        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
-        run: ant $OPTS -f java/ant.freeform test
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
-#      - name: java/ant.grammar
-#        run: ant $OPTS -f java/ant.grammar test
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
 
-      # TODO next are JDK 21+ incompatibe steps
-      - name: java/java.mx.project
+      - name: java/gradle.dependencies
         if: ${{ matrix.java == '17' }}
-        run: .github/retry.sh ant $OPTS -f java/java.mx.project test
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
 
       - name: java/gradle.java
         if: ${{ matrix.java == '17' }}
@@ -919,13 +1083,87 @@ jobs:
         if: ${{ matrix.java == '17' }}
         run: ant $OPTS -f java/gradle.dependencies test
 
-      - name: extide/o.apache.tools.ant.module
+############################
+
+############################
+
+      - name: java/gradle.java
         if: ${{ matrix.java == '17' }}
-        run: ant $OPTS -f extide/o.apache.tools.ant.module test
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
-      - name: apisupport.ant
+      - name: extide/gradle
         if: ${{ matrix.java == '17' }}
-        run: ant $OPTS -f apisupport/apisupport.ant test
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
+
+############################
+
+      - name: java/gradle.java
+        if: ${{ matrix.java == '17' }}
+        run: .github/retry.sh ant $OPTS -f java/gradle.java test
+
+      - name: extide/gradle
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f extide/gradle test
+
+      - name: java/gradle.dependencies
+        if: ${{ matrix.java == '17' }}
+        run: ant $OPTS -f java/gradle.dependencies test
+
+############################
 
       - name: Create Test Summary
         uses: test-summary/action@v2