Merge branch 'main' into argument-count-validation-mode

Author: JonasJebing

.github/FUNDING.yml

@@ -1,8 +1 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 custom: https://junit.org/sponsoring

.github/ISSUE_TEMPLATE.md

@@ -5,10 +5,19 @@ inputs:
     required: true
     description: Gradle arguments
     default: :platform-tooling-support-tests:test build --configuration-cache
+  encryptionKey:
+    required: true
+    description: Gradle cache encryption key
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/setup-test-jdk
     - uses: ./.github/actions/run-gradle
       with:
         arguments: ${{ inputs.arguments }}
+        encryptionKey: ${{ inputs.encryptionKey }}
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+      if: ${{ always() }}
+      with:
+        name: Open Test Reports (${{ github.job }})
+        path: '**/build/reports/open-test-report.html'

.github/actions/main-build/action.yml

@@ -5,16 +5,21 @@ inputs:
     required: true
     description: Gradle arguments
     default: build
+  encryptionKey:
+    required: true
+    description: Gradle cache encryption key
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
+    - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
       id: setup-gradle-jdk
       with:
         distribution: temurin
         java-version: 21
         check-latest: true
     - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
+      with:
+        cache-encryption-key: ${{ inputs.encryptionKey }}
     - shell: bash
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}

.github/actions/run-gradle/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
+    - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
       with:
         distribution: ${{ inputs.distribution }}
         java-version: 8

.github/actions/setup-test-jdk/action.yml

@@ -34,16 +34,17 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3
+      uses: github/codeql-action/init@9278e421667d5d90a2839487a482448c4ec7df4d # v3
       with:
         languages: ${{ matrix.language }}
         tools: linked
     - name: Build
       uses: ./.github/actions/run-gradle
       with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           --no-build-cache \
           -Dscan.tag.CodeQL \
           allMainClasses
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3
+      uses: github/codeql-action/analyze@9278e421667d5d90a2839487a482448c4ec7df4d # v3

.github/workflows/codeql-analysis.yml

@@ -49,7 +49,7 @@ jobs:
           version: latest
       - name: "Set up JDK ${{ matrix.jdk.version }} (${{ matrix.jdk.distribution || 'temurin' }})"
         if: matrix.jdk.type == 'ga'
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
         with:
           distribution: ${{ matrix.jdk.distribution || 'temurin' }}
           java-version: ${{ matrix.jdk.version }}
@@ -60,11 +60,17 @@ jobs:
       - name: Build
         uses: ./.github/actions/run-gradle
         with:
+          encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           arguments: |
             -PjavaToolchain.version=${{ matrix.jdk.version }} \
             -Dscan.tag.JDK_${{ matrix.jdk.version }} \
             build \
             --configuration-cache
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        if: ${{ always() }}
+        with:
+          name: Open Test Reports (${{ github.job }} ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }}))
+          path: '**/build/reports/open-test-report.html'
   openj9:
     strategy:
       fail-fast: false
@@ -82,7 +88,7 @@ jobs:
         with:
           distribution: semeru
       - name: 'Set up JDK ${{ matrix.jdk }}'
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
         with:
           distribution: semeru
           java-version: ${{ matrix.jdk }}
@@ -93,10 +99,16 @@ jobs:
       - name: Build
         uses: ./.github/actions/run-gradle
         with:
+          encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           arguments: |
             -PjavaToolchain.version=${{ matrix.jdk }} \
             -PjavaToolchain.implementation=j9 \
             -Dscan.tag.JDK_${{ matrix.jdk }} \
             -Dscan.tag.OpenJ9 \
             build \
             --configuration-cache
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        if: ${{ always() }}
+        with:
+          name: Open Test Reports (${{ github.job }})
+          path: '**/build/reports/open-test-report.html'

.github/workflows/cross-version.yml

@@ -19,7 +19,7 @@ jobs:
       with:
         fetch-depth: 1
     - name: Setup Java
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
       with:
         distribution: temurin
         java-version: 21

.github/workflows/gradle-dependency-submission.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         fetch-depth: 1
     - name: Install GraalVM
-      uses: graalvm/setup-graalvm@6f327093bb6a42fe5eac053d21b168c46aa46f22 # v1
+      uses: graalvm/setup-graalvm@3aaf71e276c9159bbdfbcdab8abc50c95f41a2c8 # v1
       with:
         distribution: graalvm-community
         version: 'latest'
@@ -32,6 +32,7 @@ jobs:
     - name: Build
       uses: ./.github/actions/main-build
       with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           -Ptesting.enableJaCoCo \
           :platform-tooling-support-tests:test \
@@ -52,6 +53,8 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
+      with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   macOS:
     runs-on: macos-latest
@@ -62,10 +65,12 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
+      with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
-    needs: linux
+    needs: Linux
     runs-on: ubuntu-latest
     permissions:
       attestations: write # required for build provenance attestation
@@ -82,11 +87,12 @@ jobs:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           publish -x check \
           prepareGitHubAttestation
     - name: Generate build provenance attestations
-      uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+      uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
       with:
         subject-path: documentation/build/attestation/*.jar
 
@@ -109,13 +115,15 @@ jobs:
     - name: Build Documentation
       uses: ./.github/actions/run-gradle
       with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           prepareDocsForUploadToGhPages \
           -Dscan.tag.Documentation
     - name: Upload Documentation
       if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
       uses: ./.github/actions/run-gradle
       with:
+        encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         arguments: |
           gitPublishPush \
           -Dscan.tag.Documentation

.github/workflows/main.yml

@@ -57,6 +57,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3
+        uses: github/codeql-action/upload-sarif@9278e421667d5d90a2839487a482448c4ec7df4d # v3
         with:
           sarif_file: results.sarif