Update workflows

jzbrooks · Jul 27, 2024 · 89a2cf2 · 89a2cf2
1 parent f8c2fe1
commit 89a2cf2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,11 +40,11 @@ jobs:
         PROPERTIES="$(./gradlew properties --console=plain -q)"
         VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
         CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
-        CHANGELOG="${CHANGELOG//'%'/'%25'}"
-        CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-        CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-        echo "::set-output name=version::$VERSION"
-        echo "::set-output name=changelog::$CHANGELOG"
+        
+        echo "version=$VERSION" >> $GITHUB_OUTPUT
+        echo "changelog<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
 
     - name: build
       run: ./gradlew build

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -43,11 +43,27 @@ jobs:
           SONATYPE_PROFILE_ID: ${{ secrets.SONATYPE_PROFILE_ID }}
         run: ./gradlew -Psigning.keyId=${{ secrets.SIGNING_KEY_ID}} -Psigning.password=${{ secrets.SIGNING_KEY_PASSWORD }} -Psigning.secretKeyRingFile=${{ secrets.SIGNING_KEY_FILE_PATH }} --no-configuration-cache publishAndReleaseToMavenCentral
 
-      - name: Patch Changelog
+      # Set environment variables
+      - name: Export Properties
+        id: properties
+        shell: bash
         run: |
-          ./gradlew patchChangelog --release-note="`cat << EOM
+          CHANGELOG="$(cat << 'EOM' | sed -e 's/^[[:space:]]*$//g' -e '/./,$!d'
           ${{ github.event.release.body }}
-          EOM`"
+          EOM
+          )"
+          
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      # Update Unreleased section with the current release note
+      - name: Patch Changelog
+        if: ${{ steps.properties.outputs.changelog != '' }}
+        env:
+          CHANGELOG: ${{ steps.properties.outputs.changelog }}
+        run: |
+          ./gradlew patchChangelog --release-note="$CHANGELOG"
 
       - name: Open PR for Changelog Update
         env: