From cebab1f4a0afc12da35c98073e5de5ec36ecbdb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:04:34 +0000 Subject: [PATCH 1/3] Update gradle/actions action to v4 --- .github/workflows/benchmark-tags.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql-daily.yml | 2 +- .github/workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/owasp-dependency-check-daily.yml | 2 +- .github/workflows/release.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml index 81335228f2b..3301b5c68f2 100644 --- a/.github/workflows/benchmark-tags.yml +++ b/.github/workflows/benchmark-tags.yml @@ -50,7 +50,7 @@ jobs: distribution: temurin java-version: 17 - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: arguments: | jmhJar diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 82bb73e5d17..8fc2d9e37eb 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -20,7 +20,7 @@ jobs: distribution: temurin java-version: 17 - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: arguments: | jmhJar diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b928eee9f1..ea56a8d4dff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: distribution: temurin java-version: 17 - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: arguments: | build @@ -134,7 +134,7 @@ jobs: distribution: temurin java-version: 17 - - uses: gradle/actions/setup-gradle@v3 + - 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' }} diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 903ed11f4b5..c45659cf060 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -27,7 +27,7 @@ jobs: # see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433 tools: latest - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: # skipping build cache is needed so that all modules will be analyzed arguments: assemble --no-build-cache diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 37bde5bf7b9..e659ca0fa97 100644 --- 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 index b67270f55aa..bd3066c618f 100644 --- a/.github/workflows/owasp-dependency-check-daily.yml +++ b/.github/workflows/owasp-dependency-check-daily.yml @@ -19,7 +19,7 @@ jobs: distribution: temurin java-version: 17 - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: arguments: "dependencyCheckAnalyze" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11b02a7df9c..1c69c655cc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: java-version: 17 - name: Build and publish artifacts - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: arguments: assemble publishToSonatype closeAndReleaseSonatypeStagingRepository env: From 0672390499506d572a1bc5232a0016796188b95d Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 7 Aug 2024 11:34:33 -0700 Subject: [PATCH 2/3] fixes for setup-gradle@v4 --- .github/workflows/benchmark-tags.yml | 8 ++++---- .github/workflows/benchmark.yml | 8 ++++---- .github/workflows/build.yml | 19 ++++++++++++------- .github/workflows/codeql-daily.yml | 9 +++++---- .../owasp-dependency-check-daily.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml index 3301b5c68f2..9953fef010a 100644 --- 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@v4 - 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 index 8fc2d9e37eb..7a8160dbca7 100644 --- 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@v4 - 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 index ea56a8d4dff..17eaf8220a7 100644 --- 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@v4 - 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@v4 + - 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 index c45659cf060..3331db67be3 100644 --- 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@v4 - 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/owasp-dependency-check-daily.yml b/.github/workflows/owasp-dependency-check-daily.yml index bd3066c618f..4f346d2848b 100644 --- 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@v4 - 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 index 1c69c655cc3..30bc0809b39 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,11 @@ jobs: distribution: temurin java-version: 17 - - name: Build and publish artifacts + - name: Set up gradle uses: gradle/actions/setup-gradle@v4 - with: - arguments: assemble publishToSonatype closeAndReleaseSonatypeStagingRepository + + - name: Build and publish artifacts + run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository env: SONATYPE_USER: ${{ secrets.SONATYPE_USER }} SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }} From a355f02420da3c4da68817dcd347294428e02730 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Wed, 7 Aug 2024 13:04:53 -0700 Subject: [PATCH 3/3] fix yaml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17eaf8220a7..33d3cfe545b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: - name: Set up gradle uses: gradle/actions/setup-gradle@v4 - name: Build - run: | + run: > ./gradlew build ${{ matrix.coverage && 'jacocoTestReport' || '' }} -PtestJavaVersion=${{ matrix.test-java-version }}