Skip to content

ci(tag): merge release branch back into develop #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzills merged 5 commits into from
Jun 8, 2026
Merged

ci(tag): merge release branch back into develop #8

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0640a75
ci(release): add auto-merge PR and tag-on-main workflows
jzills May 21, 2026
6c57a72
refactor(release): extract version parsing to script, use job outputs
jzills May 21, 2026
9e0b1f0
style(release): add spacing to extract-version script
jzills May 21, 2026
360fec3
ci(tag): merge release branch back into develop after release PR merges
jzills Jun 7, 2026
2b1403a
Merge branch 'develop' into ci/merge-back-to-develop
jzills Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,22 @@ jobs:
git config user.email "github-actions[bot]@users.noreply.github.com"
git tag "v${{ steps.version.outputs.value }}"
git push origin "v${{ steps.version.outputs.value }}"

merge-back:
name: Merge Release Back to Develop
runs-on: ubuntu-latest
needs: tag
permissions:
pull-requests: write
steps:
- name: Open PR to merge release branch back into develop
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
PR_URL=$(gh pr create \
--repo "$GITHUB_REPOSITORY" \
--title "chore: merge ${{ github.event.pull_request.head.ref }} back into develop" \
--body "Automated post-release merge. Brings release fixes and merge commits from \`${{ github.event.pull_request.head.ref }}\` back into \`develop\` to keep branches in sync per gitflow." \
--base develop \
--head "${{ github.event.pull_request.head.ref }}")
gh pr merge "$PR_URL" --merge --auto
Loading