Compare commits

..

No commits in common. "989076e794df3db39af12c8da8b1dcbbfe489f73" and "6d8358cbb961715798b8b83ee2cc1f12f3f91f6e" have entirely different histories.

4 changed files with 15 additions and 25 deletions

View File

@ -69,25 +69,24 @@ jobs:
- name: Generate Release Notes - name: Generate Release Notes
id: release_notes id: release_notes
run: | run: |
CURRENT_TAG=$(git describe --tags --abbrev=0) LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
if [ -n "$PREVIOUS_TAG" ]; then if [ -n "$LAST_TAG" ]; then
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT echo "Changes since $LAST_TAG:" >> $GITHUB_OUTPUT
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
# Get commits between previous and current tag # Get commits since last tag and categorize them
echo "### Added" >> $GITHUB_OUTPUT echo "### Added" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
echo "### Fixed" >> $GITHUB_OUTPUT echo "### Fixed" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
echo "### Changed" >> $GITHUB_OUTPUT echo "### Changed" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
echo "EOF" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT
else else
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT echo "CHANGES<<EOF" >> $GITHUB_OUTPUT

View File

@ -76,25 +76,24 @@ jobs:
- name: Generate Release Notes - name: Generate Release Notes
id: release_notes id: release_notes
run: | run: |
CURRENT_TAG=$(git describe --tags --abbrev=0) LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
if [ -n "$PREVIOUS_TAG" ]; then if [ -n "$LAST_TAG" ]; then
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT echo "Changes since $LAST_TAG:" >> $GITHUB_OUTPUT
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
# Get commits between previous and current tag # Get commits since last tag and categorize them
echo "### Added" >> $GITHUB_OUTPUT echo "### Added" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
echo "### Fixed" >> $GITHUB_OUTPUT echo "### Fixed" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
echo "" >> $GITHUB_OUTPUT echo "" >> $GITHUB_OUTPUT
echo "### Changed" >> $GITHUB_OUTPUT echo "### Changed" >> $GITHUB_OUTPUT
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true git log $LAST_TAG..HEAD --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
echo "EOF" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT
else else
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT echo "CHANGES<<EOF" >> $GITHUB_OUTPUT

View File

@ -1,13 +1,5 @@
# Changelog # Changelog
## [1.3.61] - 2025-02-22
### Added
- update release notes generation to use previous tag for changes
### Changed
- update webpages for version v1.3.61
## [1.3.60] - 2025-02-22 ## [1.3.60] - 2025-02-22
### Added ### Added
- remove automatic git push from changelog update script - remove automatic git push from changelog update script

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.3.61" version = "1.3.60"
#test #test