From 598513285e57bf73c38e5d7ba6c5321d792e2ad5 Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Sat, 24 May 2025 21:38:06 +0530 Subject: T7445: added open prs conflict check caller workflow --- .github/workflows/check-open-prs-conflict.yml | 17 +++++++++++++++++ .github/workflows/check-pr-conflicts.yml | 14 ++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/check-open-prs-conflict.yml create mode 100644 .github/workflows/check-pr-conflicts.yml (limited to '.github/workflows') diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml new file mode 100644 index 0000000..52b1193 --- /dev/null +++ b/.github/workflows/check-open-prs-conflict.yml @@ -0,0 +1,17 @@ +name: "Open PRs Conflicts checker" +on: + push: + branches: + - current + - sagitta + - circinus + workflow_dispatch: + +permissions: + contents: read + pull-requests: write + +jobs: + check-pr-conflict-call: + uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current + secrets: inherit diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml new file mode 100644 index 0000000..5417fbb --- /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@current + secrets: inherit + -- cgit v1.2.3