Perform merge-conflict label checks, via GitHub Actions

[pradyunsg]

Let's try it, and see how it works?

[uranusjr]

I didn’t read the implementation; does this add a “heyyou have conflicts” comment on the PR? Because that previous behaviour was a bit annoying at times when a PR went through multiple conflicts; if the bot had to comment, it should also delete it after the conflict was resolved.

[pradyunsg]

does this add a “heyyou have conflicts” comment on the PR?

Nope.

Because that previous behaviour was a bit annoying at times when a PR went through multiple conflicts;

I didn't quite like that behaviour either TBH. While I get the "trigger a notification to inform the author", it was usually not super useful.

I think what we'd want is the behaviour described in eps1lon/actions-label-merge-conflict#40 (different action with more capabilities). I'm subscribed there so if there's movement (or if I actually end up implementing that), then we can switch to that action and bring back the commenting behavior.

Until then, I'd prefer to stick to the simpler implementation that doesn't write any comments.

[DiddiLeija]

Do you want to add a name to the workflow? Or is pradyunsg/auto-label-merge-conflicts@v3 already including a title? I just want to know.

If we are including a name like this on the YAML file:

name: Merge-conflict check # or name you like

the GitHub interface might look better, I think.

[uranusjr]

Let's try this out.

[pradyunsg]

Do you want to add a name to the workflow?

Had the editor open, so I've done that.

[pradyunsg]

pradyunsg/auto-label-merge-conflicts@v3 is not allowed to be used in pypa/pip. Actions in this workflow must be: within a repository owned by pypa, created by GitHub or match the following: actions/checkout@v2, actions/setup-python@v2, dorny/paths-filter@v2, pre-commit/action@v2.0.0.

AHAHAA. I forgot I had enabled this restriction. We'll know on the next commit to main.

For fellow maintainers wondering, https://github.com/pypa/pip/settings/actions is where the list is.

[pradyunsg]

Merged #10292, which has triggered https://github.com/pypa/pip/runs/3333336093?check_suite_focus=true.

[DiddiLeija]

What can we do now to solve this problem?

[pradyunsg]

@DiddiLeija Thanks for taking a look. I got distracted by Mini Motorways. :)