diff options
| author | Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> | 2025-09-11 00:43:24 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-11 00:43:24 +0530 |
| commit | 74c1f0724b2dda0457b3419bbae78c2c242f7bee (patch) | |
| tree | d91aba46529129bc38db20d7f1bdfebeac67201f | |
| parent | 891f33345413fe11d3e91c433d03aa4a894fdcca (diff) | |
| parent | 185b7dab03f8f352014beab0aa5bdbd1234a388f (diff) | |
| download | vyos-build-74c1f0724b2dda0457b3419bbae78c2c242f7bee.tar.gz vyos-build-74c1f0724b2dda0457b3419bbae78c2c242f7bee.zip | |
Merge pull request #1025 from kumvijaya/current
T7748: conflict check workflow updated to use marketplace action along with increased wait/retry
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml deleted file mode 100644 index 52b11938..00000000 --- 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 f09e6641..6cca61e8 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 |