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

Delete bors.toml in favor of GitHub merge queues #228

Merged
merged 1 commit into from
Jul 14, 2023
Merged

Conversation

frewsxcv
Copy link
Member

@frewsxcv frewsxcv commented Jul 14, 2023

  • I agree to follow the project's code of conduct.
  • I added an entry to CHANGES.md if knowledge of this change could be valuable to users.

@michaelkirk michaelkirk added this pull request to the merge queue Jul 14, 2023
Merged via the queue into main with commit bde398c Jul 14, 2023
2 checks passed
@michaelkirk
Copy link
Member

I clicked "merge when ready".

goodbye bors. You were a good bot. 😢

@michaelkirk
Copy link
Member

michaelkirk commented Jul 14, 2023

Hmmm.

After merging this, I just queued #167 for merge. It seems to have immediately merged without running any tests and now main is red.

3fed23a

I guess I had the wrong idea about merge queues. Do you understand how to get a bors like workflow, where the branch is synced with master and tests are run before merging?

Also - did you intentionally choose to squash commits from the merge queue @frewsxcv? I know there are different schools of thought on this, but I like to be able to have multiple commits when it makes more sense, and I can pre-squash only when it makes things clearer.

Screenshot 2023-07-14 at 10 05 52

@urschrei
Copy link
Member

Oh yeah you need to modify the CI yaml (and enable branch protection? Not sure) I think. It's almost but not quite just flipping a switch. https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

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.

3 participants