diff options
| author | kumvijaya <kumvijaya@gmail.com> | 2025-09-07 22:47:07 +0530 |
|---|---|---|
| committer | kumvijaya <kumvijaya@gmail.com> | 2025-09-07 22:47:07 +0530 |
| commit | 185b7dab03f8f352014beab0aa5bdbd1234a388f (patch) | |
| tree | 6478d896701d9e819cc9fffeec1b64bba63acf02 /.github/workflows | |
| parent | c6d3547904cfac1bcedb16754db0dd9b86bcee51 (diff) | |
| download | vyos-build-185b7dab03f8f352014beab0aa5bdbd1234a388f.tar.gz vyos-build-185b7dab03f8f352014beab0aa5bdbd1234a388f.zip | |
T7748: conflict check workflow updated with increated wait/retry
Diffstat (limited to '.github/workflows')
| -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 |