summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2024-06-02 21:13:29 +0300
committerGitHub <noreply@github.com>2024-06-02 21:13:29 +0300
commit41eb06801c47d957c24d6a14e116c958454d433a (patch)
treea029f7f88b70e0169a1e86c8fcb7a5748e01309d
parentaeab88f5c7ed4ab698003d27e430a0360e21948a (diff)
parent7b76c8f67b51fdfb0a652e9d1bba7d2a428be73b (diff)
Merge pull request #16142 from LabNConsulting/chopps/fix-conflict-workflow
ci: only run conflict check on pull-requests
-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: