From f0d784ccf4c19da15abb474ba9950ccacd1e7c7d Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Mon, 9 Nov 2020 13:36:40 +0000
Subject: [PATCH] Use the annotated tag message for release body

---
 .github/workflows/publish-release.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 6163b8b86..89cc9c43f 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -22,6 +22,14 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools wheel twine
+      - name: Get release notes
+        id: release_notes
+        run: |
+          CHANGELOG=$(git tag -l --format='%(contents)' ${{ github.ref }})
+          CHANGELOG="${CHANGELOG//'%'/'%25'}"
+          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          echo "::set-output name=changelog::$CHANGELOG"
       - name: Create GitHub release
         id: create_release
         uses: actions/create-release@v1
@@ -30,9 +38,8 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          body: |
-            Please see the root of the repository for the CHANGELOG.md
-          draft: false
+          body: ${{ steps.release_notes.outputs.changelog }}
+          draft: true
           prerelease: false
       - name: Build and publish to PyPI
         env: