From b53571bd3467e734188ea3530ea3cf07eac804fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:57:25 +0000 Subject: [PATCH 1/4] chore(ci): bump gradle/actions from 3 to 4 Bumps [gradle/actions](https://github.com/gradle/actions) from 3 to 4. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/v3...v4) --- updated-dependencies: - dependency-name: gradle/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- .github/workflows/receive-pr.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f86449c..035ffbe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,11 +33,11 @@ jobs: with: fetch-depth: 0 show-progress: false - - uses: gradle/actions/wrapper-validation@v3 + - uses: gradle/actions/wrapper-validation@v4 - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 - name: set-up-jdk uses: actions/setup-java@v4 with: diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index 68202c59..7ce4b1f5 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: gradle/actions/wrapper-validation@v3 + - uses: gradle/actions/wrapper-validation@v4 - uses: actions/setup-java@v4 with: java-version: '21' @@ -46,7 +46,7 @@ jobs: # Execute recipes - name: Apply OpenRewrite best practices - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: arguments: ${{ env.GRADLE_SWITCHES }} licenseFormat rewriteRun -Drewrite.activeRecipe=org.openrewrite.recipes.OpenRewriteBestPractices diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58a86a76..41ea946b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: distribution: zulu java-version: 17 - name: set-up-gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: publish-candidate if: contains(github.ref, '-rc.') From 6b50d5a668621bfbfb0603c7c60209b046b5e33b Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 7 Aug 2024 20:26:47 +0200 Subject: [PATCH 2/4] Apply suggestions from code review --- .github/workflows/ci.yml | 1 - .github/workflows/receive-pr.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 035ffbe2..ffa021cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,6 @@ jobs: with: fetch-depth: 0 show-progress: false - - uses: gradle/actions/wrapper-validation@v4 - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index 7ce4b1f5..115bc101 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -27,7 +27,6 @@ jobs: with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: gradle/actions/wrapper-validation@v4 - uses: actions/setup-java@v4 with: java-version: '21' From 3d54dfbb0d2b6060b85107b2997bb86f1d39fe36 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 9 Aug 2024 14:07:50 +0200 Subject: [PATCH 3/4] Update receive-pr.yml --- .github/workflows/receive-pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index 115bc101..ed145d71 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -44,10 +44,9 @@ jobs: run: rm -f pr_number.txt # Execute recipes + - uses: gradle/actions/setup-gradle@v4 - name: Apply OpenRewrite best practices - uses: gradle/actions/setup-gradle@v4 - with: - arguments: ${{ env.GRADLE_SWITCHES }} licenseFormat rewriteRun -Drewrite.activeRecipe=org.openrewrite.recipes.OpenRewriteBestPractices + run: gradle ${{ env.GRADLE_SWITCHES }} licenseFormat rewriteRun -Drewrite.activeRecipe=org.openrewrite.recipes.OpenRewriteBestPractices # Capture the diff - name: Create patch From 09526866330b54548daae9c26c03f1536304fe37 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 9 Aug 2024 14:12:55 +0200 Subject: [PATCH 4/4] Update receive-pr.yml --- .github/workflows/receive-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index ed145d71..f235bae0 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -43,10 +43,10 @@ jobs: - name: Remove pr_number.txt run: rm -f pr_number.txt - # Execute recipes + # Apply license headers only (for now) - uses: gradle/actions/setup-gradle@v4 - - name: Apply OpenRewrite best practices - run: gradle ${{ env.GRADLE_SWITCHES }} licenseFormat rewriteRun -Drewrite.activeRecipe=org.openrewrite.recipes.OpenRewriteBestPractices + - name: Apply license headers + run: gradle ${{ env.GRADLE_SWITCHES }} licenseFormat # Capture the diff - name: Create patch