From 27d018e721a3369c50e9cab6ad017e6c6d54e52b Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Mon, 5 Apr 2021 02:11:37 +0300
Subject: [PATCH] update changelog at correct step

also fix commit filter and do not update sha anymore
---
 .github/workflows/release.yml |  2 +-
 Makefile                      | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fbbec2a7..56e57d1d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
         uses: jaywcjlove/changelog-generator@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}'
+          filter: 'Release \d+\.\d+\.\d+'
       - name: create archive
         run: make archive
         env:
diff --git a/Makefile b/Makefile
index d6856e2d..10487559 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ archive_directory: $(TARGET_FILES)
 	find "$(PROJECT)" -depth -type d -name "*.egg-info" -execdir rm -rf {} +
 
 archlinux: archive
-	sed -i "/sha512sums=('[0-9A-Fa-f]*/s/[^'][^)]*/sha512sums=('$$(sha512sum $(PROJECT)-$(VERSION)-src.tar.xz | awk '{print $$1}')'/" package/archlinux/PKGBUILD
 	sed -i "s/pkgver=[0-9.]*/pkgver=$(VERSION)/" package/archlinux/PKGBUILD
 
 changelog:
@@ -42,11 +41,15 @@ clean:
 directory: clean
 	mkdir "$(PROJECT)"
 
-push: archlinux changelog
-	git add package/archlinux/PKGBUILD src/ahriman/version.py CHANGELOG.md
+push: archlinux
+	git add package/archlinux/PKGBUILD src/ahriman/version.py
 	git commit -m "Release $(VERSION)"
-	git push
 	git tag "$(VERSION)"
+	# cheat to update changelog before push but after tag creation
+	make changelog
+	git add CHANGELOG.md
+	git commit --amend --no-edit
+	git push
 	git push --tags
 
 tests: clean