From 2d666a90a5c9de76a2e09cad6cca2b51c85f4eb5 Mon Sep 17 00:00:00 2001
From: Josh Holbrook <josh.holbrook@gmail.com>
Date: Fri, 30 Aug 2024 11:13:22 -0800
Subject: [PATCH] Fix release action (#160)

* upgrade actionlint

* Use comnoco release action

* Release v11.1.1

* create release with gh cli
---
 .github/workflows/qa.yaml      |  2 +-
 .github/workflows/release.yaml | 27 ++++++++++++++++++---------
 CHANGELOG.md                   |  6 ++++++
 pyproject.toml                 |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index 97c538c..d0573f9 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -55,4 +55,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run actionlint
-        uses: raven-actions/actionlint@v1
+        uses: raven-actions/actionlint@v2
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b269351..5b9ed11 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -52,6 +52,14 @@ jobs:
         with:
           name: man-page
           path: _build/man
+      - name: Build Release Notes
+        # thanks to https://gist.github.com/Integralist/57accaf446cf3e7974cd01d57158532c
+        run: awk '/^##/ {block++} {if (block == 1) { print }}' CHANGELOG.md > RELEASE_NOTES.md
+      - name: Store Release Notes
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-notes
+          path: RELEASE_NOTES.md
 
   pypi-release:
     runs-on: ubuntu-latest
@@ -87,13 +95,14 @@ jobs:
         with:
           name: man-page
           path: man
-      - name: Create a GitHub release
-        uses: marvinpinto/action-automatic-releases@latest
+      - name: Download release notes
+        uses: actions/download-artifact@v3
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          draft: false
-          prerelease: false
-          title: Release v${{ needs.versions.outputs.release-version }}
-          files: |
-            dist/*
-            man/pyee.1
+          name: release-notes
+          path: RELEASE_NOTES.md
+      - name: Create a GitHub release
+        env:
+          GITHUB_TOKEN: ${{ github.TOKEN }}
+        shell: bash
+        run: |
+          gh release create '${{ github.ref }}' --title 'Release v${{ needs.versions.outputs.release-version }}' --notes "$(cat RELEASE_NOTES.md)" dist/* man/pyee.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6579ae6..3dddf15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2024/08/30 Version 11.1.1
+
+- Add project URLs to pyproject.toml and PyPI
+- Use ActionLint v2
+- Fix GitHub release action
+
 ## 2023/11/23 Version 11.1.0
 
 - Generate a man page with Sphinx (in addition to mkdocs HTML)
diff --git a/pyproject.toml b/pyproject.toml
index 593193f..c06863d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyee"
-version = "11.1.0"
+version = "11.1.1"
 authors = [
   {name = "Josh Holbrook", email = "josh.holbrook@gmail.com"}
 ]