bors icon indicating copy to clipboard operation
bors copied to clipboard

feat: Don't allow the merging of PRs when they don't have a clean state [WIP]

Open Gustrb opened this issue 1 month ago • 5 comments

I still have some stuff do do before marking it as "Ready to Review"

  • [x] Write some tests
  • [ ] Validate locally everything works fine
  • [ ] Validate the text message, I added some simple copy, might not be good enough

I am just starting with this so might take some time :) All advice is appreciated

Closes #452

Gustrb avatar Nov 04 '25 12:11 Gustrb

Hi, @Gustrb! I also was working on it. Here is my version - [block approval commit] (https://github.com/bncer/bors/commit/c2493ad75da19b35636b100696105e0143202707) I included - OctocrabMergeableState::Blocked noticing here

bncer avatar Nov 04 '25 19:11 bncer

Hey @bncer should we maybe merge the OctocrabMergeableState::Blocked state as well? Don't know if there are more to this than that, but we can collaborate if you wish :)

Gustrb avatar Nov 04 '25 22:11 Gustrb

Yeah, definitely we can work together.

As for MergeableState::Blocked octocrab uses enum what was provided from github api. I can only find API doc from GraphQL API. I think it should be included in merge conflict state.

bncer avatar Nov 05 '25 04:11 bncer

@Gustrb I set up local environment by hard coding some required fields. I can help to setup, if you have some issues.

bncer avatar Nov 05 '25 04:11 bncer

Hi, thanks for the PR! :) I just wanted to note that I'm having a very busy week right now, and probably won't have time to take a look until next week.

Kobzol avatar Nov 05 '25 17:11 Kobzol