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 #1037

Merged
merged 5 commits into from
Aug 21, 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.

@urschrei
Copy link
Member

I just added the merge_group setting as per the docs (and as seen in the geojson repo). Shall we do this?

@michaelkirk
Copy link
Member

Let's hold off until we figure out what we're doing wrong with our settings. e.g. see

georust/proj#169
georust/proj#170
georust/proj#171
georust/proj#172
georust/proj#173
georust/proj#174
georust/proj#175

frewsxcv and others added 3 commits August 21, 2023 15:48
We need a ci-status job that explicitly fails, rather than skips.

As we discovered in georust/proj#179,
the previous configuration would skip the aggregate "ci status" job if
any of it's `needs` failed, which would result in the merge queue
proceeding with the merge.
@michaelkirk
Copy link
Member

michaelkirk commented Aug 21, 2023

I've rebased and pushed up some commits to this branch (I hope that's OK!)

Based on what we discovered in georust/proj#179, I updated our workflow to get merge queues functioning how we want.

I also pushed up another commit with a failing test so we can double check that things are functioning as expected.

If I get a 👍 we can click "merge when ready" and hopefully it will fail to merge from the failing test.
Then we can revert the failing test commit and everything should be gravy.

Update: failing as expected ->
Screenshot 2023-08-21 at 15 55 31

@michaelkirk
Copy link
Member

Clicked "merged when ready"...

Hopefully this will fail to merge, and then I can revert the failing test commit.

@michaelkirk
Copy link
Member

Screenshot 2023-08-21 at 16 07 30

Cool, seems to be doing the right thing so far. It won't merge because of the failing check. Let me revert that problematic commit now.

@michaelkirk michaelkirk added this pull request to the merge queue Aug 21, 2023
Merged via the queue into main with commit 267ae70 Aug 21, 2023
14 checks passed
@michaelkirk michaelkirk deleted the frewsxcv-patch-1 branch August 21, 2023 23:20
@michaelkirk
Copy link
Member

bors is dead, long live the merge queue.

goodbye bors. 😢

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

3 participants