From ca9128d3aea4bc5d21c4505aff3e9e4fcdb8a914 Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Mon, 8 Sep 2025 23:38:40 +0530 Subject: T7748: conflict check workflow updated to use marketplace action along with increased wait/retry --- .github/workflows/check-open-prs-conflict.yml | 17 ----------------- .github/workflows/check-pr-conflicts.yml | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/check-open-prs-conflict.yml diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml deleted file mode 100644 index 52b1193..0000000 --- a/.github/workflows/check-open-prs-conflict.yml +++ /dev/null @@ -1,17 +0,0 @@ -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 index 5417fbb..6cca61e 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -1,3 +1,4 @@ + name: "PR Conflicts checker" on: pull_request_target: @@ -9,6 +10,5 @@ permissions: jobs: check-pr-conflict-call: - uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current + uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current secrets: inherit - -- cgit v1.2.3