Skip to content

Commit 04f498d

Browse files
committed
minor fixes
1 parent 5246e98 commit 04f498d

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ jobs:
1616
run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
1717

1818
- name: 📝 Generate CHANGELOG.md
19-
run: make chlog
19+
run: |
20+
git --version
21+
make --version
22+
make chlog
2023
2124
- name: 🚀 Create GitHub Release
2225
run: |

Makefile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,34 @@ docker-build:
5454
-t ghcr.io/$(REPO):$(VERSION) .
5555
docker run -p 8080:8080 py-server
5656

57-
CHLOG_LENGTH ?= 15
57+
CHLOG_LENGTH ?= 5
5858
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
59+
VERSION := $(shell git describe --tags --abbrev=0)
60+
5961

6062
chlog:
61-
@echo "# 📦 Changelog" > CHANGELOG.md
62-
@echo "" >> CHANGELOG.md
63-
@echo "## Date: $(shell date '+%Y-%m-%d')" >> CHANGELOG.md
64-
@echo "" >> CHANGELOG.md
63+
@echo "# Changelog for $(VERSION)\n" > CHANGELOG.md
64+
@printf "## Date: $(shell date '+%Y-%m-%d')\n\n" >> CHANGELOG.md
6565
@rm -f .chlog-seen
6666

67-
@echo "### ✨ Features" >> CHANGELOG.md
67+
@printf "### ✨ Features\n\n" >> CHANGELOG.md
6868
@git log -n $(CHLOG_LENGTH) --grep="^feat" --pretty=format:"%h" | tee -a .chlog-seen | \
6969
xargs -I{} git log -1 --pretty=format:"- {} %d %s (%ad)" --date=relative {} >> CHANGELOG.md
70-
@echo "" >> CHANGELOG.md
7170

72-
@echo "### 🐛 Fixes" >> CHANGELOG.md
71+
@printf "### 🐛 Fixes\n\n" >> CHANGELOG.md
7372
@git log -n $(CHLOG_LENGTH) --grep="^fix" --pretty=format:"%h" | tee -a .chlog-seen | \
7473
xargs -I{} git log -1 --pretty=format:"- {} %d %s (%ad)" --date=relative {} >> CHANGELOG.md
75-
@echo "" >> CHANGELOG.md
7674

77-
@echo "### 🧹 Chores & Refactors" >> CHANGELOG.md
75+
@printf "\n\n### 🧹 Chores & Refactors\n\n" >> CHANGELOG.md
7876
@git log -n $(CHLOG_LENGTH) --grep="^chore\|^refactor" --pretty=format:"%h" | tee -a .chlog-seen | \
7977
xargs -I{} git log -1 --pretty=format:"- {} %d %s (%ad)" --date=relative {} >> CHANGELOG.md
80-
@echo "" >> CHANGELOG.md
8178

82-
@echo "### 📌 Other Commits" >> CHANGELOG.md
79+
@printf "\n\n### 📌 Other Commits\n\n" >> CHANGELOG.md
8380
@git log -n $(CHLOG_LENGTH) --pretty=format:"%h" | while read hash; do \
8481
grep -q $$hash .chlog-seen || \
8582
git log -1 --pretty=format:"- $$hash %d %s (%ad)" --date=relative $$hash >> CHANGELOG.md; \
86-
echo "" >> CHANGELOG.md; \
83+
printf "\n" >> CHANGELOG.md; \
8784
done
88-
@echo "" >> CHANGELOG.md
8985

9086
@sed -i -E \
9187
-e 's/HEAD -> $(BRANCH),? ?//g' \

0 commit comments

Comments
 (0)