From c75a1a3c20b0948b46fa9a97c386e9aaf02a8760 Mon Sep 17 00:00:00 2001
From: Kelvin Mo <kmo@users.sourceforge.net>
Date: Sat, 29 Jan 2022 09:54:20 +1100
Subject: [PATCH] Update release action

---
 .github/workflows/release.yml | 21 +++++++++++++----
 CHANGELOG.md                  | 43 +++++++++++++++++------------------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 698c3d7..a78a03d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    name: Build and release
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -35,6 +35,15 @@ jobs:
       - name: Install dependencies
         run: composer install
 
+      - name: Build jwkstool.phar
+        run: composer phar
+
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Get semantic version
         id: semver
         uses: booxmedialtd/ws-action-parse-semver@v1
@@ -42,12 +51,16 @@ jobs:
           input_string: ${{ github.ref }}
           version_extractor_regex: '\/v(.*)$'
 
-      - name: Build jwkstool.phar
-        run: composer phar
+      - name: Get Changelog
+        id: changelog
+        uses: statamic/changelog-action@v1
+        with:
+          version: ${{ github.ref }}
 
       - name: Create Github release
         uses: ncipollo/release-action@v1
         with:
-          artifacts: bin/jwkstool.phar
           token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: bin/jwkstool.phar
+          body: ${{ steps.changelog.outputs.text }}
           prerelease: ${{ !!steps.semver.outputs.prerelease }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2704979..086b94e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,22 +14,22 @@ All notable changes to this project will be documented in this file.
 - Fixed: Decoding JSON formatted JWEs
 - Fixed: Parsing multi-recipient JWTs and JWEs
 
-## Version 0.5.3
+## 0.5.3
 
 - Fixed: typos in documentation leading to deprecation error (#39)
 - Fixed: incorrect treatment of recipients object in JWE
 - Removed: support for PHP 5
 
-## Version 0.5.2
+## 0.5.2
 
 - Fixed: Undefined index when calling JWT::deserialise() and
   JWE::decrypt() with an unrecognised token format (#37)
 
-## Version 0.5.1
+## 0.5.1
 
 - Added: Support for PHP 8 (#35)
 
-## Version 0.5.0
+## 0.5.0
 
 - Added: Support for AES GCM family of algorithms
 - Added: Support for Elliptic Curve Diffie-Hellman key derivation
@@ -44,19 +44,19 @@ All notable changes to this project will be documented in this file.
 - Removed: SimpleJWT\Keys\Key::getSignature()
 - Fixed: Autoload issue in jwkstool (#31)
 
-## Version 0.4.2
+## 0.4.2
 
 - Fixed: Uninitialised values in SimpleJWT\JWT::deserialise() for JWTs encoded
   in JSON serialisation format (#29)
 - Note: Arguments and/or return values for SimpleJWT\JWT::deserialise() may change
   in the next release
 
-## Version 0.4.1
+## 0.4.1
 
 - Fixed: Composer dependencies on `symfony/console` for PHP 7 compatibility
   (#22)
 
-## Version 0.4.0
+## 0.4.0
 
 - Changed: jwkstool build process
 - Fixed: Syntax error in SimpleJWT\JWE::decrypt()
@@ -64,7 +64,7 @@ All notable changes to this project will be documented in this file.
 - Deprecated: SimpleJWT\Keys\Key::getSignature() - use 
    SimpleJWT\Keys\Key::getThumbnail() instead
 
-## Version 0.3.1
+## 0.3.1
 
 - Fixed undefined variable error when using JWE with a symmetric key (#19)
 - Fixed Util::packInt64() when running 32-bit PHP 7
@@ -73,60 +73,59 @@ All notable changes to this project will be documented in this file.
 - Refactored Util::random_bytes() to specify file-based entropy source
   for Unix-like systems
 
-## Version 0.3.0
+## 0.3.0
 
 - Refactored key signature methodology to align with
   [RFC 7638](https://tools.ietf.org/html/rfc7638)
 - Fixed typo in documentation
 
-## Version 0.2.5
+## 0.2.5
 
 - Fixed incorrect handling of kid when using symmetric encryption (#13)
 - Enhanced documentation
 - Refactored coding style
 
-## Version 0.2.3/4
+## 0.2.4
 
 - Fixed support for RSA-OAEP-256
 - Fixed incorrect encoding of RSA keys into PEM (#10)
 
-## Version 0.2.2
+## 0.2.2
 
 - Fixed incorrect decoding of PEM-encoded EC private keys (#8)
 - Improved decoding of PEM-encoded RSA keys
 - Enhanced tests
 
-## Version 0.2.0/1
+## 0.2.1
 
 - Refactored code to add deserialise function
 
-## Version 0.1.6
+## 0.1.6
 
 - Support newer versions of OpenSSL used in PHP 7, which uses lowercase
   cipher and message digest names (#7)
 
-## Version 0.1.5
+## 0.1.5
 
 - Fixed namespace error in documentation blocks (#3)
 
-## Version 0.1.4
+## 0.1.4
 
 - Fixed syntax error when throwing exception as a result of an invalid
   COMPACT_FORMAT token (#1)
 
-## Version 0.1.3
+## 0.1.3
 
 - Fixed bug in jwkstool in referencing renamed method in KeySet
 
-## Version 0.1.2
+## 0.1.2
 
-- Fixed bug caused by dependency issues with `symfony/composer`.  The version
-  of this library is now locked to 2.7.*
+- Fixed bug caused by dependency issues with `symfony/composer`.  The   of this library is now locked to 2.7.*
 
-## Version 0.1.1
+## 0.1.1
 
 - Enhanced compatibility with PHP 7
 
-## Version 0.1.0
+## 0.1.0
 
 - Initial release