From 678a8f7d02419b7d0dc3eebe6389cd433b5522a1 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sat, 6 Jul 2024 08:33:11 -0700
Subject: [PATCH] Test run.

---
 .github/workflows/deploy.yml | 7 +++++--
 settings.gradle              | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 706d88d..4d202b1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,6 +29,7 @@ jobs:
     name: deploy
     env:
       gh_token: ${{ secrets.GITHUB_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 }}
@@ -44,9 +45,11 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           gradle-home-cache-cleanup: true
-      - name: git fetch origin main
-        run: git fetch origin main
+      - run: git fetch origin main
       - name: publish all
         if: "${{ github.event.inputs.to_publish == 'all' }}"
         run: |
           ./gradlew :changelogPush -Prelease=true -Penable_publishing=true -Pgradle.publish.key=${{ secrets.GRADLE_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_SECRET }} --stacktrace --warning-mode all
+      - run: git checkout main
+      - run: git merge release --ff-only
+      - run: git push origin main
diff --git a/settings.gradle b/settings.gradle
index ed6e364..8d5b5e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ plugins {
 	// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
 	id 'com.diffplug.spotless' version '7.0.0.BETA1' 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.1' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
@@ -21,9 +21,9 @@ plugins {
 blowdryerSetup {
 	github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0'
 	//devLocal '../blowdryer-diffplug'
-	setPluginsBlockTo {
-		it.file 'plugin.versions'
-	}
+	//	setPluginsBlockTo {
+	//		it.file 'plugin.versions'
+	//	}
 }
 rootProject.name = 'spotless-changelog'
 include 'spotless-changelog-lib'