fix(ci): use PRs instead of direct push for changelog updates

Branch protection on main requires PRs and merge queue. Both
update-changelog.yml and promote.yml now create/update a PR
instead of pushing directly to main.
This commit is contained in:
James Rich
2026-04-27 15:19:51 -05:00
parent dfef7375c4
commit cd9ca5ae21
2 changed files with 47 additions and 9 deletions

View File

@@ -204,8 +204,18 @@ jobs:
git config user.email "github-actions[bot]@users.noreply.github.com"
git add CHANGELOG.md
git diff --cached --quiet || {
git commit -m "docs: release CHANGELOG.md for v${VERSION} [skip ci]"
git push origin "changelog/v${VERSION}":main
BRANCH="automation/changelog-v${VERSION}"
git checkout -B "$BRANCH"
git commit -m "docs: release CHANGELOG.md for v${VERSION}"
git push origin "$BRANCH" --force
gh pr create \
--title "docs: release CHANGELOG.md for v${VERSION}" \
--body "Automated changelog stamp for production release v${VERSION}." \
--head "$BRANCH" \
--base main \
--label "automation" \
--label "skip-changelog"
}
- name: Notify Discord

View File

@@ -9,7 +9,7 @@ on:
permissions:
contents: write
pull-requests: read
pull-requests: write
concurrency:
group: changelog-${{ github.ref }}
@@ -59,6 +59,7 @@ jobs:
- name: Update CHANGELOG.md
if: steps.last_tag.outputs.tag != ''
id: update
env:
TAG: ${{ steps.last_tag.outputs.tag }}
run: |
@@ -92,13 +93,40 @@ jobs:
f.write(new_content)
" "$UNRELEASED"
- name: Commit and push
if: steps.last_tag.outputs.tag != ''
# Check if there are actual changes
if git diff --quiet CHANGELOG.md; then
echo "changed=false" >> "$GITHUB_OUTPUT"
else
echo "changed=true" >> "$GITHUB_OUTPUT"
fi
- name: Create or update changelog PR
if: steps.last_tag.outputs.tag != '' && steps.update.outputs.changed == 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
BRANCH="automation/update-changelog"
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
# Force-update the automation branch
git checkout -B "$BRANCH"
git add CHANGELOG.md
git diff --cached --quiet || {
git commit -m "docs: update CHANGELOG.md [skip ci]"
git push origin main
}
git commit -m "docs: update CHANGELOG.md"
git push origin "$BRANCH" --force
# Create or update the PR
EXISTING_PR=$(gh pr list --head "$BRANCH" --state open --json number -q '.[0].number')
if [ -n "$EXISTING_PR" ]; then
echo "Updated existing PR #$EXISTING_PR"
else
gh pr create \
--title "docs: update CHANGELOG.md" \
--body "Automated changelog update from push to main." \
--head "$BRANCH" \
--base main \
--label "automation" \
--label "skip-changelog"
echo "Created new changelog PR"
fi