Merge pull request apache#6538 from vieiro/feature/master-to-cnd-2023…

…-10-05

[cnd] merge master into cnd for JDK21-ga builds

.github/workflows/main.yml

@@ -29,6 +29,10 @@ concurrency:
   group: ${{ github.head_ref || github.run_id }}-${{ github.base_ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 env:
 
   # note to self: don't remove the minus again
@@ -96,7 +100,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '11', '17', '21-ea' ]
+        java: [ '11', '21' ]
       fail-fast: false
     steps:
 
@@ -107,10 +111,11 @@ jobs:
           distribution: ${{ env.default_java_distribution }}
 
       - name: Checkout ${{ github.ref }} ( ${{ github.sha }} )
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: false
+          show-progress: false
 
       - name: Caching dependencies
         uses: actions/cache@v3
@@ -120,7 +125,7 @@ jobs:
           restore-keys: ${{ runner.os }}-
 
       - name: Setup Gradle Daemon to run on JDK 11
-        if: ${{ matrix.java == '21-ea' }}
+        if: ${{ matrix.java == '21' }}
         run: |
           mkdir -p ~/.gradle
           #uses a preinstalled JDK 11 from the runner
@@ -161,11 +166,18 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'nb-javac') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+
+      - name: Checkout ${{ github.ref }} ( ${{ github.sha }} )
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: false
+          show-progress: false
+
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-            distribution: 'zulu'
+            distribution: ${{ env.default_java_distribution }}
             java-version: 11
       - name: Caching dependencies
         uses: actions/cache/restore@v3
@@ -186,13 +198,17 @@ jobs:
 
 # secondary jobs
   linux-commit-validation:
-    name: Commit Validation on Linux/JDK ${{ matrix.java }}
+    name: CV on ${{ matrix.os }}/JDK ${{ matrix.java }}
     needs: base-build
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }} 
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '11', '17', '21-ea' ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        java: [ 11 ]
+        include:
+          - os: ubuntu-latest
+            java: 21
       fail-fast: false
     steps:
 
@@ -203,6 +219,7 @@ jobs:
           distribution: ${{ env.default_java_distribution }}
 
       - name: Setup Xvfb
+        if: contains(matrix.os, 'ubuntu') && success()
         run: |
           echo "DISPLAY=:99.0" >> $GITHUB_ENV
           Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
@@ -212,18 +229,34 @@ jobs:
         with:
           name: build
 
-      - name: Extract
+      # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" doesn't work
+      - name: Extract on MacOS
+        if: contains(matrix.os, 'macos') && success()
+        run: unzstd -c build.tar.zst | tar -x
+
+      - name: Extract on Linux/Windows
+        if: contains(matrix.os, 'macos') == false && success()
         run: tar --zstd -xf build.tar.zst
 
+      - name: platform/masterfs.macosx
+        if: contains(matrix.os, 'macos') && success()
+        run: ant $OPTS -f platform/masterfs.macosx test
+
+      # fails on 17+
+      - name: platform/core.network
+        if: matrix.java == 11 && success()
+        run: ant $OPTS -f platform/core.network test
+
       - name: Commit Validation tests
         run: ant $OPTS -Dcluster.config=$CLUSTER_CONFIG commit-validation
 
       - name: Create Test Summary
         uses: test-summary/action@v2
         if: failure()
         with:
-          paths: "./nbbuild/build/test/commit-validation/results/TEST-*.xml"
-
+          paths: |
+            ./*/*/build/test/*/results/TEST-*.xml
+            ./nbbuild/build/test/commit-validation/results/TEST-*.xml
 
   # commit related checks - some steps run even when the build is dissabled
   paperwork:
@@ -247,10 +280,11 @@ jobs:
 
       - name: Checkout ${{ github.ref }} ( ${{ github.sha }} )
         if: ${{ !cancelled() }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: false
+          show-progress: false
           fetch-depth: 10
 
       - name: Print last 10 Commits
@@ -915,9 +949,6 @@ jobs:
       - name: platform/core.netigso
         run: ant $OPTS -Dvanilla.javac.exists=true -f platform/core.netigso test
 
-      - name: platform/core.network
-        run: ant $OPTS -Dvanilla.javac.exists=true -f platform/core.network test
-
       - name: platform/core.osgi
         run: ant $OPTS -Dvanilla.javac.exists=true -f platform/core.osgi test
 
@@ -986,7 +1017,7 @@ jobs:
 
       # use cache so that the platform build doesn't have to download dependencies again
       - name: Caching dependencies
-        uses: actions/cache@v3
+        uses: actions/cache/restore@v3
         with:
           path: ~/.hgexternalcache
           key: ${{ runner.os }}-${{ hashFiles('*/external/binaries-list', '*/*/external/binaries-list') }}
@@ -1768,49 +1799,6 @@ jobs:
           paths: "./*/*/build/test/*/results/TEST-*.xml"
 
 
-  macos:
-    name: Tests on MacOS/JDK ${{ matrix.java }}
-    needs: base-build
-    runs-on: macos-11
-    timeout-minutes: 90
-    strategy:
-      matrix:
-        java: [ '11' ]
-    steps:
-
-      - name: Set up JDK ${{ matrix.java }} 
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java }} 
-          distribution: ${{ env.default_java_distribution }}
-
-      - name: Download Build
-        uses: actions/download-artifact@v3
-        with:
-          name: build
-
-      # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" isn't working
-      - name: Extract
-        run: unzstd -c build.tar.zst | tar -x
-
-      - name: Test platform/masterfs.macosx
-        run: ant $OPTS -f platform/masterfs.macosx test
-
-      - name: Test platform/core.network
-        run: ant $OPTS -f platform/core.network test
-
-      - name: Commit Validation tests
-        run: ant $OPTS -Dcluster.config=$CLUSTER_CONFIG commit-validation
-
-      - name: Create Test Summary
-        uses: test-summary/action@v2
-        if: failure()
-        with:
-          paths: |
-            "./*/*/build/test/*/results/TEST-*.xml"
-            "./nbbuild/build/test/commit-validation/results/TEST-*.xml"
-
-
   javafx-test:
     name: JavaFX on Linux/JDK ${{ matrix.java }}
     needs: base-build
@@ -1957,7 +1945,7 @@ jobs:
 
 
   enterprise-test:
-    name: Enterprise on Linux/JDK ${{ matrix.java }} (some on 8)
+    name: Enterprise on Linux/JDK ${{ matrix.java }} (some on 8 and 17)
     needs: base-build
     runs-on: ubuntu-latest
     timeout-minutes: 60
@@ -2066,9 +2054,6 @@ jobs:
       - name: maven.j2ee
         run: ant $OPTS -f enterprise/maven.j2ee test
 
-      - name: micronaut
-        run: .github/retry.sh ant $OPTS -f enterprise/micronaut test
-
 # Fails
 #      - name: enterpirse/payara.common
 #        run: ant $OPTS -f enterprise/payara.common test
@@ -2198,6 +2183,15 @@ jobs:
       - name: j2ee.dd.webservice
         run: ant $OPTS -f enterprise/j2ee.dd.webservice test
 
+      - name: Set up JDK 17 for tests that are not compatible with JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: ${{ env.default_java_distribution }}
+
+      - name: micronaut
+        run: .github/retry.sh ant $OPTS -f enterprise/micronaut test
+
       - name: Create Test Summary
         uses: test-summary/action@v2
         if: failure()
@@ -2332,15 +2326,12 @@ jobs:
     needs: base-build
     runs-on: ${{ matrix.os }}
     timeout-minutes: 120
-    defaults:
-      run:
-        shell: bash
     env:
       DISPLAY: ":99.0"
     strategy:
       matrix:
         java: [ '11' ]
-        os: [ 'windows-2022', 'ubuntu-20.04' ]
+        os: [ 'windows-latest', 'ubuntu-latest' ]
       fail-fast: false
     steps:
 
@@ -2373,9 +2364,6 @@ jobs:
       - name: Extract
         run: tar --zstd -xf build.tar.zst
 
-      - name: Test Platform Core Network
-        run: ant $OPTS -f platform/core.network test
-
       - name: hudson.php
         run: ant $OPTS -f php/hudson.php test
 
@@ -2525,7 +2513,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        graal: [ '20.3.0', '21.1.0' ]
+        graal: [ '22.3.1' ]
       fail-fast: false
 
     steps:
@@ -2544,16 +2532,13 @@ jobs:
 
       - name: Setup GraalVM
         run: |
-          URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java8-linux-amd64-${{ matrix.graal }}.tar.gz
+          URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java11-linux-amd64-${{ matrix.graal }}.tar.gz
           curl -L $URL | tar -xz
-          GRAALVM=`pwd`/graalvm-ce-java8-${{ matrix.graal }}
+          GRAALVM=`pwd`/graalvm-ce-java11-${{ matrix.graal }}
           echo "JAVA_HOME=$GRAALVM" >> $GITHUB_ENV
 
       - name: Setup GraalVM Languages
-        run: |
-          $JAVA_HOME/bin/gu install python
-          $JAVA_HOME/bin/gu install R
-          $JAVA_HOME/bin/gu install ruby
+        run: $JAVA_HOME/bin/gu install --no-progress python R ruby js
 
       - name: platform/core.network
         run: ant $OPTS -f platform/core.network test
@@ -2650,7 +2635,6 @@ jobs:
       - apisupport-modules-test
       - build-tools
       - webcommon-test
-      - macos
       - php
       - javafx-test
       - groovy-test
@@ -2671,10 +2655,11 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: true
+          show-progress: false
 
       - name: Delete Workspace Artifact
         uses: ./.github/actions/delete-artifact/