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

Merge queue take two #4254

Closed
wants to merge 9 commits into from

Conversation

michaelsproul
Copy link
Member

@michaelsproul michaelsproul commented May 2, 2023

Issue Addressed

Part of #4251

Proposed Changes

Add success jobs to test-suite and local-testnet that list all other jobs as dependencies and use a script to check that they depend on all other jobs.

@michaelsproul michaelsproul changed the base branch from stable to unstable May 2, 2023 04:12
@michaelsproul michaelsproul added ready-for-review The code is ready for review infra-ci labels May 2, 2023
Co-authored-by: Paul Hauner <paul@paulhauner.com>
@michaelsproul
Copy link
Member Author

I think once the jobs are added to the admin UI this will be ready to merge. We can do that tomorrow (Weds).

@michaelsproul
Copy link
Member Author

I got Age to add the rules, so I'm going to try merging this (we hadn't added linkcheck before this screenshot was taken, but it's there now).

branch-protection

@michaelsproul michaelsproul added this pull request to the merge queue May 3, 2023
@michaelsproul michaelsproul removed this pull request from the merge queue due to a manual request May 3, 2023
@michaelsproul
Copy link
Member Author

Just hotfixed the target branch check: it was failing because merge_group events don't set the base_ref. I think making the job pass in this case is better than skipping it, as the final status job needs it.

@michaelsproul
Copy link
Member Author

It seems like Github's merge queue works quite differently from Bors, in that it requires CI to finish on the branch before even adding it to the queue 😩 This is really annoying when CI takes 2 hours and we often push small corrections immediately before queueing. It means we essentially have to run CI twice on every PR with no option to skip.

This is discussed in the public feedback as a "much wanted" feature:

Require different status checks for a PR's entry into the queue vs. for merging by the queue

Hopefully that gets implemented soon. In the meantime I think we should keep using Bors.

@michaelsproul michaelsproul added blocked and removed ready-for-review The code is ready for review labels May 3, 2023
@michaelsproul
Copy link
Member Author

Closing this for now as it's stale. We might be better off self-hosting Bors if they shutdown the main instance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants