Conversation
On every push to main, opens (or refreshes) a PR main -> develop so develop stays in sync with the latest release commit. The PR's merge commit is created by GitHub web-flow and is therefore signed by web-flow, which the make verify GPG gate already exempts. Requires "Allow GitHub Actions to create and approve pull requests" to be enabled under Settings -> Actions -> General -> Workflow permissions.
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds
.github/workflows/backmerge.yml: on every push tomain, opens (or refreshes) a PRmain->developsodevelopstays in sync with the latest release commit.Why a PR, not a direct push
A PR keeps the back-merge visible, lets conflicts surface explicitly, and the merge commit GitHub creates when you click "Merge pull request" is signed by
web-flow- which themake verifyGPG gate already exempts (see CHANGES.mdv0.4.0, entry on the verification GPG gate).Workflow behaviour
mainonly (not tags, not other branches).developis already up-to-date withmain(git merge-base --is-ancestor).main -> developalready exists - subsequent pushes auto-update that PR via the head branch.backmergequeues simultaneous triggers, no cancel-in-progress.contents: read,pull-requests: write.Repo settings
The org-level toggle "Allow GitHub Actions to create and approve pull requests" has already been enabled via
gh api(/repos/.../actions/permissions/workflow->can_approve_pull_request_reviews: true). Default workflow permissions remainread; the workflow declares its own elevatedpull-requests: write.One-time back-merge for v0.4.0
This workflow takes effect for releases after it lands on
main. The back-merge ofv0.4.0(merge commit93723ffon main) intodevelopis implicit in this PR itself - merging develop -> main here is a no-op for file contents other thanbackmerge.yml, and the future workflow will keep the two branches in sync going forward.Test plan
main(or wait for the next release) and confirm the workflow opens a PRmain->develop.make verifyondevelop(GPG gate ignores web-flow signatures).