ci(Mergify): use rebase+merge queue #7592
Merged
Conversation
This file contains 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
fgaz
changed the title
* use queues * rebase+merge strategy * merge+squash strategy Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
fgaz
force-pushed
the
mergify/fgaz/config-update
branch
from
ba92d9d to
95a8f25
Compare
|
Huh, apparently CI failed, but no individual check is red so I could see the failure log... |
|
Apparently one of them was canceled:
|
Mikolaj
approved these changes
Aug 30, 2021
emilypi
approved these changes
Aug 30, 2021
|
Great! I'm force-merging since the failure is spurious |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change has been made by @fgaz from https://mergify.io config editor.
actions/merge/strict is deprecated, so I switched it to merge queues.
I also changed the merge method from squash to rebase+merge, for a clean history (provided prs are clean too), which I think was the original intent behind the introduction of this bot. Opinions? Maybe there should be both this and a "squash+merge me" label for squashable atomic prs so that we don't have to ask the author to do it when it's necessary?
edit: added the squash strategy too