From 7294a1983f1769ca2624d63705573d7f3dbbbda9 Mon Sep 17 00:00:00 2001
From: Guardian Automated Maven Release
 <automated.maven.release.admins@theguardian.com>
Date: Sun, 3 Dec 2023 17:02:57 +0000
Subject: [PATCH] Maybe this will allow multiple lines going to GITHUB_OUTPUT

---
 .github/workflows/isolated-release.yml | 13 +++++++------
 build.sbt                              |  7 +------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/isolated-release.yml b/.github/workflows/isolated-release.yml
index c332d03..47b0ccf 100644
--- a/.github/workflows/isolated-release.yml
+++ b/.github/workflows/isolated-release.yml
@@ -29,10 +29,10 @@ jobs:
           key_fingerprint=$(echo $key_fingerprint_and_email | awk '{print $1}')
           key_email=$(echo $key_fingerprint_and_email | awk '{print $2}')
           
-          {
-            "key_fingerprint=$key_fingerprint"
-            "key_email=$key_email"
-          } >> $GITHUB_OUTPUT
+          cat << EndOfFile >> $GITHUB_OUTPUT
+          key_fingerprint=$key_fingerprint
+          key_email=$key_email"
+          EndOfFile
 
   generate-version-update-commits:
     name: Generate Version Update Commits
@@ -75,6 +75,7 @@ jobs:
           fail-on-cache-miss: true
       - uses: actions/setup-java@v3
         with:
+          distribution: corretto
           java-version: 17
           gpg-private-key: ${{ secrets.AUTOMATED_MAVEN_RELEASE_PGP_SECRET }}
       - name: Create commit
@@ -172,10 +173,10 @@ jobs:
           fail-on-cache-miss: true
       - name: Create tiny sbt project to perform Sonatype upload
         run: |
-          cat <<EOT > build.sbt
+          cat << EndOfFile > build.sbt
           sonatypeBundleDirectory := new File("/tmp/funky")
           sonatypeProfileName := "com.gu"
-          EOT
+          EndOfFile
           
           mkdir project
           echo 'addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")' > project/plugins.sbt
diff --git a/build.sbt b/build.sbt
index cfbbc74..26808cf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -62,12 +62,7 @@ lazy val `etag-caching-root` = (project in file("."))
       setReleaseVersion,
       commitReleaseVersion,
       tagRelease,
-      pushChanges,
-      // For non cross-build projects, use releaseStepCommand("publishSigned")
-      releaseStepCommandAndRemaining("+publishSigned"),
-      releaseStepCommand("sonatypeBundleRelease"),
       setNextVersion,
-      commitNextVersion,
-      pushChanges
+      commitNextVersion
     )
   )