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

Use merge queue #1367

Merged
merged 1 commit into from Mar 9, 2024
Merged

Use merge queue #1367

merged 1 commit into from Mar 9, 2024

Conversation

bluss
Copy link
Member

@bluss bluss commented Mar 9, 2024

@adamreichold's recipe

  • We don't run CI on the main branch at all any more because all commits are tested before being put there.
  • Which tests are run is not differentiated by branch name but by event, either pull requests or merge queues.
  • PR run should small and fast for quick feedback on proposed changes.
  • Pre-merge checks should be complete so that the main branch is always is a known good state.

@bluss
Copy link
Member Author

bluss commented Mar 9, 2024

Wish me luck

@bluss bluss added this pull request to the merge queue Mar 9, 2024
Merged via the queue into master with commit 77dd957 Mar 9, 2024
1 check passed
@bluss
Copy link
Member Author

bluss commented Mar 9, 2024

Well, bad luck, it's supposed to run both yaml files for the merge queue 🤔

@bluss bluss deleted the ci branch March 9, 2024 14:24
@adamreichold
Copy link
Collaborator

Well, bad luck, it's supposed to run both yaml files for the merge queue 🤔

Are you sure merge queues are enabled?

@bluss
Copy link
Member Author

bluss commented Mar 9, 2024

yes, it used the merge queue for this one

@adamreichold
Copy link
Collaborator

It might be necessary to explicit configure the require CI workflows for merge queues in the branch protection rules (of the main branch).

@bluss
Copy link
Member Author

bluss commented Mar 9, 2024

There's a lot of unnecessary and unintiuitive caveats mentioned here https://stackoverflow.com/a/76740962 and hopefully that's the right track..

All docs seem to suggest 'Require status checks to pass before merging' is an independent setting and not necessary, but something's going on.

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

Successfully merging this pull request may close these issues.

None yet

2 participants