summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2024-05-31 13:08:16 -0400
committerChristian Hopps <chopps@labn.net>2024-06-02 10:14:34 -0400
commit7b76c8f67b51fdfb0a652e9d1bba7d2a428be73b (patch)
treebae59ca0c2a073e37dbfc9cf96793b54b79462fe /.github
parent8954dd3a6b291cc2f778a322aad18418a13675f6 (diff)
ci: only run conflict check on pull-requests
This change will stop this action from running on forked repos. Previously whenever one pushed a change to one's development branch the action would "run but skip" which still generated an email notifications and thus was very annoying. :) Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/conflicts.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
index 100f557e02..4b4e99facf 100644
--- a/.github/workflows/conflicts.yml
+++ b/.github/workflows/conflicts.yml
@@ -1,9 +1,8 @@
name: Add a conflict label if PR needs to rebase
on:
- push:
pull_request_target:
- types: [synchronize]
+ types: [opened, reopened, synchronize]
jobs:
conflicts: