diff options
| author | kumvijaya <kumvijaya@gmail.com> | 2025-10-18 22:35:04 +0530 |
|---|---|---|
| committer | kumvijaya <kumvijaya@gmail.com> | 2025-10-18 22:35:04 +0530 |
| commit | bed6f5c8ee28c84a3629ed5ee323eba270347f65 (patch) | |
| tree | 5a9b4e60d0d9c0726dbd06f2e3eefd5cb5cb90e7 /.github/workflows | |
| parent | ff247fe83f4b24b5ed977ac9b04fb5fe19b196f0 (diff) | |
| download | vyos1x-config-bed6f5c8ee28c84a3629ed5ee323eba270347f65.tar.gz vyos1x-config-bed6f5c8ee28c84a3629ed5ee323eba270347f65.zip | |
T7878: conflict check updated to use mergify
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, 2 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 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..5bf1c10 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -8,7 +8,8 @@ permissions: contents: read jobs: - check-pr-conflict-call: + check-pr-conflict: + if: github.repository_owner == 'vyos' uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current secrets: inherit |