diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-09-10 10:45:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 10:45:37 +0300 |
| commit | df14155ac393858f6df004db03540739430ae66e (patch) | |
| tree | c6ea1247c24f5c6e5c18c9f811729e8d2f781dbf /.github/workflows | |
| parent | 9f0c49de0877f9bbdeedad8ff56e86bed28f4f44 (diff) | |
| parent | cea08c59b74ada5cb70de5646e2b1c75f8bed54c (diff) | |
| download | vyatta-bash-df14155ac393858f6df004db03540739430ae66e.tar.gz vyatta-bash-df14155ac393858f6df004db03540739430ae66e.zip | |
Merge pull request #18 from kumvijaya/current
T7748: conflict check workflow updated to use marketplace action along with increased 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 | 3 |
2 files changed, 1 insertions, 19 deletions
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..cbe9e0e 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -9,6 +9,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 - |