Update gradle/actions action to v4 (#6618)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]>
open-telemetry · Aug 8, 2024 · e8b50c6 · e8b50c6
1 parent 4f9d1c9
commit e8b50c6
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 26 deletions.
diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml
@@ -50,10 +50,10 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: |
-            jmhJar
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Run jmh
+        run: ./gradlew jmhJar
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -20,10 +20,10 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: |
-            jmhJar
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Run jmh
+        run: ./gradlew jmhJar
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,10 +61,11 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: |
-            build
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build
+        run: >
+            ./gradlew build
             ${{ matrix.coverage && 'jacocoTestReport' || '' }}
             -PtestJavaVersion=${{ matrix.test-java-version }}
             -Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
@@ -134,12 +135,16 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - uses: gradle/actions/setup-gradle@v3
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+        # skipping release branches because the versions in those branches are not snapshots
+        # (also this skips pull requests)
+        if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
+      - name: Publish to Sonatype
+        run: ./gradlew assemble publishToSonatype
         # skipping release branches because the versions in those branches are not snapshots
         # (also this skips pull requests)
         if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
-        with:
-          arguments: assemble publishToSonatype
         env:
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}

diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
@@ -27,10 +27,11 @@ jobs:
           # see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
           tools: latest
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          # skipping build cache is needed so that all modules will be analyzed
-          arguments: assemble --no-build-cache
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Assemble
+        # skipping build cache is needed so that all modules will be analyzed
+        run: ./gradlew assemble --no-build-cache
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/actions/wrapper-validation@v3.5.0
+      - uses: gradle/actions/wrapper-validation@v4.0.0
diff --git a/.github/workflows/owasp-dependency-check-daily.yml b/.github/workflows/owasp-dependency-check-daily.yml
@@ -19,9 +19,10 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: "dependencyCheckAnalyze"
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Check dependencies
+        run: ./gradlew dependencyCheckAnalyze
 
       - name: Upload report
         if: always()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,10 +21,11 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Build and publish artifacts
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}