From 564cc64ef618c55d99bb3d97726729bdc72e75d6 Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Wed, 27 Aug 2025 19:10:54 +0530 Subject: T7748: conflict check workflow updated to marketplace action with increased wait and retry --- .github/workflows/check-open-prs-conflict.yml | 17 ----------------- .github/workflows/check-pr-conflicts.yml | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 .github/workflows/check-open-prs-conflict.yml (limited to '.github/workflows') diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml deleted file mode 100644 index 52b11938e..000000000 --- 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 f09e66415..6cca61e8d 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -10,5 +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