Skip to content
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.

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

Mergify: switch from strict mode to a merge queue #1535

Merged
merged 1 commit into from
Dec 9, 2021
Merged

Conversation

RyanGlScott
Copy link
Contributor

Previously, we were using Mergify's smart mode to serialize the PRs that Mergify merges. This mode has been deprecated, however, and indeed, there is a smart mode brownout today to force Mergify users to switch over: https://blog.mergify.com/strict-mode-deprecation/ This PR does just that, based on the migration strategy suggested in that link.

@RyanGlScott RyanGlScott added the tooling: CI Issues involving CI/CD scripts or processes label Dec 6, 2021
@RyanGlScott
Copy link
Contributor Author

Ugh. Despite the fact that this PR changes the Mergify configuration from an invalid configuration to a valid one, Mergify still refuses to consider it: https://github.com/GaloisInc/saw-script/pull/1535/checks?check_run_id=4435257575

I'm not quite sure what to make of this.

@RyanGlScott
Copy link
Contributor Author

Now that Mergify's brownout is over, I can actually see what Mergify thinks of the configuration change:

Configuration changed. This pull request must be merged manually — 4 potential rules

‼️Action Required ‼

The configuration uses the deprecated strict mode of the merge action.
A brownout is planned for the whole December 6th, 2021 day.
This option will be removed on January 10th, 2022.
For more information: https://blog.mergify.com/strict-mode-deprecation/

⚠️The configuration has been changed, queue and merge actions are ignored. ⚠

Confusingly, it acknowledges that the configuration has changed while still warning about the use of strict mode, which is the very thing that this PR changes. More importantly, it claims that this must be merged manually due to the configuration change. I guess that's what we'll have to do, then. Any objections?

@RyanGlScott RyanGlScott requested a review from kquick December 7, 2021 11:45
Copy link
Member

@kquick kquick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Previously, we were using Mergify's `smart` mode to serialize the PRs that
Mergify merges. This mode has been deprecated, however, and indeed, there
is a `smart` mode brownout today to force Mergify users to switch over:
https://blog.mergify.com/strict-mode-deprecation/
This PR does just that, based on the migration strategy suggested in that link.
@RyanGlScott RyanGlScott merged commit 7a5c82e into master Dec 9, 2021
@RyanGlScott RyanGlScott deleted the mergify-queue branch December 9, 2021 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tooling: CI Issues involving CI/CD scripts or processes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants