From 01f084ec195fbb4067f55a9e22482216fa17c609 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 16 Apr 2024 19:18:25 +0200
Subject: [PATCH] Use new Gradle actions (#3781)

---
 .github/actions/run-gradle/action.yml           | 17 +++++++++--------
 .github/workflows/codeql-analysis.yml           |  4 ++--
 .github/workflows/cross-version.yml             | 12 ++++++------
 .github/workflows/gradle-wrapper-validation.yml |  2 +-
 .github/workflows/main.yml                      |  6 +++---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
index 856f81a8994..70191fd53f4 100644
--- a/.github/actions/run-gradle/action.yml
+++ b/.github/actions/run-gradle/action.yml
@@ -13,13 +13,14 @@ runs:
       with:
         distribution: temurin
         java-version: 21
-    - uses: gradle/gradle-build-action@v3
+    - uses: gradle/actions/setup-gradle@v3
+    - shell: bash
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
-      with:
-        arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -Pjunit.develocity.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }}
-          "-Dscan.value.GitHub job=${{ github.job }}"
-          javaToolchains
-          ${{ inputs.arguments }}
+      run: |
+        ./gradlew \
+        -Porg.gradle.java.installations.auto-download=false \
+        -Pjunit.develocity.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }} \
+        "-Dscan.value.GitHub job=${{ github.job }}" \
+        javaToolchains \
+        ${{ inputs.arguments }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5fc548c2ab4..264bcc0a79f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -40,8 +40,8 @@ jobs:
       uses: ./.github/actions/run-gradle
       with:
         arguments: |
-          --no-build-cache
-          -Dscan.tag.CodeQL
+          --no-build-cache \
+          -Dscan.tag.CodeQL \
           allMainClasses
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 3debab40350..aa3a9b4dec1 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -41,8 +41,8 @@ jobs:
         uses: ./.github/actions/run-gradle
         with:
           arguments: |
-            -PjavaToolchain.version=${{ matrix.jdk }}
-            -Dscan.tag.JDK_${{ matrix.jdk }}
+            -PjavaToolchain.version=${{ matrix.jdk }} \
+            -Dscan.tag.JDK_${{ matrix.jdk }} \
             build
       - name: Upload Test Distribution trace files
         uses: actions/upload-artifact@v4
@@ -77,8 +77,8 @@ jobs:
         uses: ./.github/actions/run-gradle
         with:
           arguments: |
-            -PjavaToolchain.version=${{ matrix.jdk }}
-            -PjavaToolchain.implementation=j9
-            -Dscan.tag.JDK_${{ matrix.jdk }}
-            -Dscan.tag.OpenJ9
+            -PjavaToolchain.version=${{ matrix.jdk }} \
+            -PjavaToolchain.implementation=j9 \
+            -Dscan.tag.JDK_${{ matrix.jdk }} \
+            -Dscan.tag.OpenJ9 \
             build
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index ec9e5be652d..76fe77620d7 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -19,4 +19,4 @@ jobs:
         with:
           fetch-depth: 1
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6eb2ae1b11f..16f37c7b07e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,9 +38,9 @@ jobs:
       uses: ./.github/actions/main-build
       with:
         arguments: |
-          -Ptesting.enableJaCoCo
-          build
-          jacocoRootReport
+          -Ptesting.enableJaCoCo \
+          build \
+          jacocoRootReport \
           prepareDocsForUploadToGhPages
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v4