Commit Graph

9 Commits

Author SHA1 Message Date
TsjipTsjip c32eaeb331
Update PR Labeler to v5 (#26845)
* Update PR Labeler to v5

* Change conflict labeler.

* Implement draft filtering functionality

* Actually, pull_request_target is appropriate here.
2024-05-07 02:13:15 +02:00
Debug 6687a3187f
Prevent action runners from being wasted on DeltaV-Bot (#831)
Stop actions from running on our bot
2024-02-13 16:12:37 +00:00
DEATHB4DEFEAT ce1c86dff4
Update conflict-labeler.yml (#380)
Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2023-11-02 00:08:07 +01:00
metalgearsloth 033e87aa3b
Don't run CI For PJBot (#13188)
I have no idea what I'm doing
2022-12-26 17:37:57 -06:00
ike709 640e2dac89
Stop labeling draft PRs with merge conflicts (#9089) 2022-06-23 18:25:34 -07:00
ike709 381bcf7c91
Don't flag merge conflicts on draft PRs (#8821) 2022-06-14 17:20:27 +10:00
ike709 1af683ee90
Revert "Remove merge conflict comment" (#8820) 2022-06-13 18:45:23 +02:00
wrexbe a39233c6ff
Remove merge conflict comment (#8819) 2022-06-13 08:03:00 -07:00
Moony ab1b37ebbf
Add a merge conflict check. (#8626)
* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>
2022-06-04 20:34:48 -07:00