rust-lang / team

Rust teams structure
Apache License 2.0
306 stars 285 forks source link

Update project-stable-mir.toml #1288

Closed celinval closed 7 months ago

celinval commented 7 months ago

Bors still doesn't seem to work in our repository, and it seems that we can't merge things manually any more.

Is there any other step we need to take to enable bors?

Kobzol commented 7 months ago

Bors (homu) has to be configured manually at the moment (https://github.com/rust-lang/homu?tab=readme-ov-file#how-to-configure). CC @Mark-Simulacrum, I'm not actually sure how to do it.

Btw, isn't bors a bit overkill for this repo? :sweat_smile:

celinval commented 7 months ago

@Kobzol I have been wondering the same thing. We initially thought it would be the easiest way to collaborate to our tests by using the same workflow as the Rust repo, but enabling bors has been more challenging than we anticipated. @oli-obk do you think we should just provide write access to maintainers and give up on bors?

oli-obk commented 7 months ago

Yea, just merging stuff seems fine. We can use GitHub actions without bors for per PR CI and resolve rare merge issues manually

Kobzol commented 7 months ago

https://github.com/rust-lang/team/pull/1297

celinval commented 7 months ago

The one thing I want to call out is that we currently cannot merge things to our main branch anymore. I have this PR open: https://github.com/rust-lang/project-stable-mir/pull/60. I am a maintainer of this project, but I cannot merge it. I see the following message instead:

The base branch restricts merging to authorized users. Learn more about protected branches.

You’re not authorized to merge this pull request.

I was able to merge it before, see https://github.com/rust-lang/project-stable-mir/pull/55 for the last PR that was merged.

Kobzol commented 7 months ago

https://github.com/rust-lang/team/pull/1297 should resolve that issue.

celinval commented 7 months ago

OK... we used to be able to merge despite that line, but let's give it a shot. Thanks!

celinval commented 7 months ago

We'll use regular GitHub process for this repo for now on. Thank you @Kobzol!

Kobzol commented 7 months ago

No problem.