Automate backport merge #84
Conversation
* tries to automatically merge from maint-* branches to a specified list of branches defined in .backport-branches file * if merge conflict occurs, it opens a PR for the maintainer to review
|
Feedback from @pnpavlov: we should open a PR instead of auto merge from maint- to rel- branches. |
|
I think this pr makes https://github.com/gardenlinux/package-linux/blob/main/.github/workflows/backport.yml obsolete, that should be deleted as part of this pr |
| on: | ||
| push: | ||
| branches: | ||
| - 'maint-*' # Trigger when any maint-* branch is updated |
There was a problem hiding this comment.
I'm not sure if this works in our scenario.. I think I had issues with it here https://github.com/gardenlinux/package-linux/blob/main/.github/workflows/backport.yml#L6 but I don't remember all the details. Curious how you tested this.
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v2 | ||
| with: |
There was a problem hiding this comment.
just to point out that this is not an oversight: actions/checkout will use the branch that triggered the event, so maint-6.6 in this case, which is what we want, cf https://github.com/actions/checkout?tab=readme-ov-file#usage
not sure if I'd prefer to specify the ref here explicitly, but as far as I am aware this is functionally equivalent
What this PR does / why we need it:
Automatically tries to merge changes in maint-* branches to all rel-* branches specified in .backport-branches file in respective maint-* branch
opens PR if merge conflicts occur, so the maintainer can check and fix manually
Which issue(s) this PR fixes:
Fixes #83
Special notes for your reviewer: