update changelog at correct step

also fix commit filter and do not update sha anymore
This commit is contained in:
Evgenii Alekseev 2021-04-05 02:11:37 +03:00
parent a0e20ffb77
commit 27d018e721
2 changed files with 8 additions and 5 deletions

View File

@ -20,7 +20,7 @@ jobs:
uses: jaywcjlove/changelog-generator@main uses: jaywcjlove/changelog-generator@main
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}' filter: 'Release \d+\.\d+\.\d+'
- name: create archive - name: create archive
run: make archive run: make archive
env: env:

View File

@ -21,7 +21,6 @@ archive_directory: $(TARGET_FILES)
find "$(PROJECT)" -depth -type d -name "*.egg-info" -execdir rm -rf {} + find "$(PROJECT)" -depth -type d -name "*.egg-info" -execdir rm -rf {} +
archlinux: archive 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 sed -i "s/pkgver=[0-9.]*/pkgver=$(VERSION)/" package/archlinux/PKGBUILD
changelog: changelog:
@ -42,11 +41,15 @@ clean:
directory: clean directory: clean
mkdir "$(PROJECT)" mkdir "$(PROJECT)"
push: archlinux changelog push: archlinux
git add package/archlinux/PKGBUILD src/ahriman/version.py CHANGELOG.md git add package/archlinux/PKGBUILD src/ahriman/version.py
git commit -m "Release $(VERSION)" git commit -m "Release $(VERSION)"
git push
git tag "$(VERSION)" 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 git push --tags
tests: clean tests: clean