summaryrefslogtreecommitdiff
path: root/.github/workflows/check-pr-conflicts.yml
diff options
context:
space:
mode:
authorRobert Göhler <github@ghlr.de>2024-05-28 12:43:59 +0200
committerGitHub <noreply@github.com>2024-05-28 12:43:59 +0200
commit7dfb68ba3c5a5edbee9df7d3f93cbd1c32346bc0 (patch)
tree6438c3c30a3b316daa944551c6e54b2f1a6c2a15 /.github/workflows/check-pr-conflicts.yml
parentb0cd1ebf1b9cbd4b5ef9b289b1db3ef62a614c88 (diff)
parentba108f6ca4f94f6ecb81961e0068a4c715443885 (diff)
downloadvyos-documentation-7dfb68ba3c5a5edbee9df7d3f93cbd1c32346bc0.tar.gz
vyos-documentation-7dfb68ba3c5a5edbee9df7d3f93cbd1c32346bc0.zip
Merge pull request #1467 from vyos/mergify/bp/equuleus/pr-14641.3.8
T6410: applied reusable workflows (auto-author-assign,check-pr-conflicts,lint-doc) (backport #1464)
Diffstat (limited to '.github/workflows/check-pr-conflicts.yml')
-rw-r--r--.github/workflows/check-pr-conflicts.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
new file mode 100644
index 00000000..0c659e6e
--- /dev/null
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -0,0 +1,14 @@
+
+name: "PR Conflicts checker"
+on:
+ pull_request_target:
+ types: [synchronize]
+
+permissions:
+ pull-requests: write
+ contents: read
+
+jobs:
+ check-pr-conflict-call:
+ uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
+ secrets: inherit