OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix changes.md written to main

Browse Source
This commit is contained in:
Meliox 2026-08-09 14:19:56 +02:00
parent d12a205bb9
commit 83abef4e03
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/prepare-release-pr.yml vendored
View File

@ -46,24 +46,21 @@ jobs:
git fetch origin main git fetch origin main
if [[ "${{ github.event_name }}" == "push" ]]; then # Collect all commits touching src/ since the last release tag (both paths need this)
# Always recreate from main — avoids rebase conflicts after PR merge
git checkout -b chore/version-bump origin/main
# Collect all commits touching src/ since the last release tag
LAST_TAG=$(git describe --tags --abbrev=0 origin/main 2>/dev/null || true) LAST_TAG=$(git describe --tags --abbrev=0 origin/main 2>/dev/null || true)
if [[ -n "$LAST_TAG" ]]; then if [[ -n "$LAST_TAG" ]]; then
LOG=$(git log "${LAST_TAG}..origin/main" --oneline -- src/ | head -50) LOG=$(git log "${LAST_TAG}..origin/main" --oneline -- src/ | head -50)
else else
LOG=$(git log origin/main --oneline -- src/ | head -50) LOG=$(git log origin/main --oneline -- src/ | head -50)
fi fi
mkdir -p .github/version-bump echo "${LOG:-No src/ changes since last release.}" > /tmp/CHANGES.md
echo "${LOG:-No src/ changes since last release.}" > .github/version-bump/CHANGES.md
git add .github/version-bump/CHANGES.md if [[ "${{ github.event_name }}" == "push" ]]; then
git diff --cached --quiet || git commit -m "chore: collect changes since ${LAST_TAG:-initial}" # Always recreate from main — avoids rebase conflicts after PR merge
git checkout -b chore/version-bump origin/main
git push --force origin chore/version-bump git push --force origin chore/version-bump
else else
# Label change: check out the existing branch, no CHANGES.md update # Label change: check out the existing branch
git fetch origin chore/version-bump git fetch origin chore/version-bump
git checkout chore/version-bump git checkout chore/version-bump
fi fi
@ -119,7 +116,7 @@ jobs:
env: env:
NEW_VERSION: ${{ steps.version.outputs.new }} NEW_VERSION: ${{ steps.version.outputs.new }}
run: | run: |
LOG=$(cat .github/version-bump/CHANGES.md 2>/dev/null || true) LOG=$(cat /tmp/CHANGES.md 2>/dev/null || true)
DATE=$(date -R) DATE=$(date -R)
# Base on main's changelog so reruns always replace the previous bot entry cleanly # Base on main's changelog so reruns always replace the previous bot entry cleanly
MAIN_CHANGELOG=$(git show origin/main:debian/changelog) MAIN_CHANGELOG=$(git show origin/main:debian/changelog)
@ -146,7 +143,7 @@ jobs:
{ {
echo "## Release v${NEW_VERSION}" echo "## Release v${NEW_VERSION}"
echo "" echo ""
cat .github/version-bump/CHANGES.md 2>/dev/null || echo "No changes recorded." cat /tmp/CHANGES.md 2>/dev/null || echo "No changes recorded."
echo "" echo ""
echo "---" echo "---"
echo "*Change label to \`bump:minor\` or \`bump:major\` before merging if needed.*" echo "*Change label to \`bump:minor\` or \`bump:major\` before merging if needed.*"