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

feat(actions): migrate Mergify to GitHub Merge Queue #9005

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Conversation

gustavovalverde
Copy link
Member

Motivation

We previously migrated to GitHub Rulesets as the new and preferred way to handle branch protection rules, but Mergify hasn't been updated to use rulesets, and we're also dealing with some deprecations around our actual Mergify configurations.

As GitHub Merge queue has matured enough to comply with most of our use cases, and it's already included in our actual GitHub Plan, we decided to start this migration path.

This is an initial step before completely removing Mergify, to keep the duality between the two to avoid downtime with queue management

Specifications & References

Solution

  • Additionally to the tests that are triggered in a PR, we'll additionally re-run the Integration tests and CD Tests as these are the most relevant tests that must be confirmed when multiple PRs are being merged at the same time.

Tests

  • After merging this PR we should disable Mergify and activate GitHub Merge Queue, to confirm the behavior, as this only gets evaluated once the merge_group is available in the default branch.

Follow-up Work

  • Disable Mergify and turn on GitHub Merge Queue
  • We should evaluate this new behavior, the time it takes for Merge PRs to get fully evaluated, etc.
  • The Merge queue configurations should be as similar as the ones we have in the mergify.yml file
  • Documentation should be updated in the following PR, once everything has been confirmed and the removal of Mergify is finalized.

PR Author's Checklist

  • The PR name will make sense to users.
  • The PR provides a CHANGELOG summary.
  • The solution is tested.
  • The documentation is up to date.
  • The PR has a priority label.

PR Reviewer's Checklist

  • The PR Author's checklist is complete.
  • The PR resolves the issue.

This is an initial step before completely removing Mergify, to keep the duality betwen the two to avoid downtime with queue management
@gustavovalverde gustavovalverde added A-devops Area: Pipelines, CI/CD and Dockerfiles C-deprecation Category: Old features that will soon be gone I-usability Zebra is hard to understand or use C-feature Category: New features P-High 🔥 labels Nov 8, 2024
@gustavovalverde gustavovalverde self-assigned this Nov 8, 2024
@gustavovalverde gustavovalverde requested a review from a team as a code owner November 8, 2024 09:47
@gustavovalverde gustavovalverde requested review from oxarbitrage and removed request for a team November 8, 2024 09:47
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Nov 8, 2024
Copy link
Contributor

@oxarbitrage oxarbitrage 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 as the first step, let's merge and disable mergify to see if it works.

mergify bot added a commit that referenced this pull request Nov 11, 2024
mergify bot added a commit that referenced this pull request Nov 11, 2024
@mergify mergify bot merged commit edff643 into main Nov 11, 2024
204 of 205 checks passed
@mergify mergify bot deleted the feat-github-queue branch November 11, 2024 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-devops Area: Pipelines, CI/CD and Dockerfiles C-deprecation Category: Old features that will soon be gone C-feature Category: New features C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG I-usability Zebra is hard to understand or use P-High 🔥
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants