diff options
| author | kumvijaya <kumvijaya@gmail.com> | 2025-11-04 13:16:35 +0530 |
|---|---|---|
| committer | kumvijaya <kumvijaya@gmail.com> | 2025-11-04 13:16:35 +0530 |
| commit | 6f5f7ce415563b4583407893fdc05b1417c193ce (patch) | |
| tree | afd1554aa7c3c4c0fd3cdba73c402de8d3c9c437 /.github | |
| parent | e1b7b865a63454ae4b8f840c94ab599633faaf7f (diff) | |
| download | vyos-1x-6f5f7ce415563b4583407893fdc05b1417c193ce.tar.gz vyos-1x-6f5f7ce415563b4583407893fdc05b1417c193ce.zip | |
T7981: prs conflict check workflow updated to use schedule
Diffstat (limited to '.github')
| -rw-r--r-- | .github/mergify.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 23 |
2 files changed, 15 insertions, 18 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml deleted file mode 100644 index 8733cfcad..000000000 --- a/.github/mergify.yml +++ /dev/null @@ -1,10 +0,0 @@ -pull_request_rules: - - name: Label conflicting pull requests - description: Add a label to a pull request with conflict to spot it easily - conditions: - - conflict - - '-closed' - actions: - label: - toggle: - - conflicts diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml index 9b0b97423..12c5e49a6 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -1,15 +1,22 @@ -name: "PR Conflicts checker" +name: "PRs Conflict checker" on: + schedule: + # Run every hour to check for PR conflicts + - cron: '0 * * * *' pull_request_target: - types: [synchronize] - -permissions: - pull-requests: write - contents: read + types: [synchronize, closed] + workflow_dispatch: # Allow manual triggering jobs: - check-pr-conflict: - if: github.repository_owner == 'vyos' + check-prs-conflict: + if: | + github.event_name == 'schedule' || + github.event_name == 'workflow_dispatch' || + (github.event_name == 'pull_request_target' && github.event.action == 'synchronize') || + (github.event_name == 'pull_request_target' && github.event.action == 'closed' && github.event.pull_request.merged == true) uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current + permissions: + contents: read + pull-requests: write secrets: inherit |