From 08abbf9e60813de5cc6446e7ea99993894662598 Mon Sep 17 00:00:00 2001 From: Joshua Zillwood Date: Sat, 6 Jun 2026 21:41:06 -0500 Subject: [PATCH] ci(tag): merge release branch back into develop after release PR merges --- .github/workflows/tag.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index ccc3011..fd97b22 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -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