From d6c68e6fda2948ef964d1be73e789c0013bccd40 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:09:07 +0000 Subject: [PATCH 1/8] Update plugin com.diffplug.spotless-changelog to v3.1.2 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index c105dcffd9..3b65b34033 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ plugins { // https://github.com/spotbugs/spotbugs-gradle-plugin/releases id 'com.github.spotbugs' version '6.0.18' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md - id 'com.diffplug.spotless-changelog' version '3.0.2' apply false + id 'com.diffplug.spotless-changelog' version '3.1.2' apply false // https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md id 'com.adarshr.test-logger' version '4.0.0' apply false // https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags From cb9fb0a16295faa9227fd4acc6ebe31144b98502 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 7 Jul 2024 08:58:55 +0800 Subject: [PATCH 2/8] Use GITHUB_TOKEN --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d5106c79a3..e964372c93 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -# GH_TOKEN +# GITHUB_TOKEN # NEXUS_USER # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java # byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8); @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest name: deploy env: - gh_token: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }} ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }} ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} From 43b7f2062cb80787730f6dc258cbed088dafa2ea Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 12:40:14 -0700 Subject: [PATCH 3/8] Bump versions from BETA1 to BETA2 --- gradle/changelog.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle index 2cad156a63..beeb3235b9 100644 --- a/gradle/changelog.gradle +++ b/gradle/changelog.gradle @@ -20,11 +20,11 @@ spotlessChangelog { commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced if (kind == 'gradle') { - forceNextVersion '7.0.0.BETA1' + forceNextVersion '7.0.0.BETA2' } else if (kind == 'maven') { - forceNextVersion '2.44.0.BETA1' + forceNextVersion '2.44.0.BETA2' } else { - forceNextVersion '3.0.0.BETA1' + forceNextVersion '3.0.0.BETA2' } } From 57e25f274503842062c39765d5445877638bda8d Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 12:54:01 -0700 Subject: [PATCH 4/8] Setup github releases uses spotlessChangelog. --- gradle/changelog.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle index beeb3235b9..cce1509a6c 100644 --- a/gradle/changelog.gradle +++ b/gradle/changelog.gradle @@ -1,11 +1,15 @@ String kind +String releaseTitle if (project.name == 'plugin-gradle') { kind = 'gradle' + releaseTitle = 'Gradle Plugin' } else if (project.name == 'plugin-maven') { kind = 'maven' + releaseTitle = 'Maven Plugin' } else { assert project == rootProject kind = 'lib' + releaseTitle = 'Lib' } // the root project and plugins have their own changelogs @@ -18,6 +22,8 @@ spotlessChangelog { branch 'release' tagPrefix "${kind}/" commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced + tagMessage '{{changes}}' + runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag" if (kind == 'gradle') { forceNextVersion '7.0.0.BETA2' From 38bffffb9c226e43c3f51f5abc49f897770385be Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 13:00:47 -0700 Subject: [PATCH 5/8] Automatically merge the `release` branch into `main` and push it. --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e964372c93..a3f1a47c27 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -66,3 +66,6 @@ jobs: if: "${{ github.event.inputs.to_publish == 'lib' }}" run: | ./gradlew :changelogPush -Prelease=true --stacktrace --warning-mode all --no-configuration-cache + - run: git checkout main + - run: git merge release --ff-only + - run: git push origin main \ No newline at end of file From 4afe020dc708693cce2a240ac4ac9461dc27ca92 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 13:01:42 -0700 Subject: [PATCH 6/8] Make sure that we have write permission in the deploy job. --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a3f1a47c27..02b5b4c8c1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,6 +29,8 @@ jobs: build: runs-on: ubuntu-latest name: deploy + permissions: + contents: write env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }} From ad70544f85d3b9ecd277741ae8754924ae14d785 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 13:20:26 -0700 Subject: [PATCH 7/8] GITHUB_TOKEN comes for free. --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 02b5b4c8c1..1c1cca5bc0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,3 @@ -# GITHUB_TOKEN # NEXUS_USER # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java # byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8); From 8d28afb758f9c843726ac08fc73e7f0831b87769 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Sun, 25 Aug 2024 12:52:16 -0700 Subject: [PATCH 8/8] Fix from knowledge in cli/cli#9299 --- gradle/changelog.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle index cce1509a6c..61813f9797 100644 --- a/gradle/changelog.gradle +++ b/gradle/changelog.gradle @@ -22,7 +22,7 @@ spotlessChangelog { branch 'release' tagPrefix "${kind}/" commitMessage "Published ${kind}/{{version}}" // {{version}} will be replaced - tagMessage '{{changes}}' + tagMessage "${kind} v{{version}}\n\n{{changes}}" runAfterPush "gh release create ${kind}/{{version}} --title '${releaseTitle} v{{version}}' --notes-from-tag" if (kind == 'gradle') {