diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-08-27 19:28:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-27 19:28:19 +0300 |
| commit | adb3e06fc90e092d414be19240c490a92aad7c3f (patch) | |
| tree | 97a8160338b84ebc8eb2e172969c86390d11f5de | |
| parent | 2f1d1d343a3dba6de06a9625d58bf32e8ee5d095 (diff) | |
| parent | 564cc64ef618c55d99bb3d97726729bdc72e75d6 (diff) | |
| download | vyos-1x-adb3e06fc90e092d414be19240c490a92aad7c3f.tar.gz vyos-1x-adb3e06fc90e092d414be19240c490a92aad7c3f.zip | |
Merge pull request #4681 from kumvijaya/current
T7748: conflict check workflow updated to marketplace action with increased wait and 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 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 |