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

Enable "merge_group" events for GitHub's merge queue #1857

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Feb 21, 2024

Status

Ready for review, needs discussion

Description

We need to also trigger on the "merge_group" event for GitHub's merge queue to work. This is the same as freedomofpress/securedrop-dev-docs#130.

Test Plan

  • Visual review

@legoktm legoktm requested a review from a team as a code owner February 21, 2024 21:55
@legoktm
Copy link
Member Author

legoktm commented Feb 21, 2024

This is ready to go whenever, but I'm marking this as blocked because our current rate of failures in the various client test jobs (aka the segfaults) might end up making this super annoying if we have to keep retrying merges if it keeps failing CI during the merge queue step.

@legoktm
Copy link
Member Author

legoktm commented Feb 21, 2024

Also just to clarify, this alone doesn't enable the merge queue, it still requires infra to actually hit the checkbox. But this prepares our CI manifests for it, so there's no harm in merging it now I suppose.

@legoktm
Copy link
Member Author

legoktm commented Mar 22, 2024

CI is failing because of #1944, but I would like to land this now and we can try out the merge queue and disable it if it's problematic.

We need to also trigger on the "merge_group" event for GitHub's
merge queue to work. This is the same as <freedomofpress/securedrop-dev-docs#130>.
Copy link
Contributor

@rocodes rocodes left a comment

Choose a reason for hiding this comment

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

@rocodes rocodes merged commit c6aa978 into main Apr 19, 2024
92 checks passed
@rocodes rocodes deleted the merge-group branch April 19, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants