diff options
| author | Vijayakumar A <36878324+kumvijaya@users.noreply.github.com> | 2025-11-22 00:22:00 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-22 00:22:00 +0530 |
| commit | cae2717e9a608a1706e9dc134f7d560453ec4bfe (patch) | |
| tree | 3d769474de9b5c38cdb52742ae85ab22929e78c6 /.github/workflows | |
| parent | cfb2a5ee7fe9bd68498edbb232c3e71160eaeff3 (diff) | |
| parent | 19664528695e0c900f464e22c9d5567784463121 (diff) | |
| download | vyos-1x-cae2717e9a608a1706e9dc134f7d560453ec4bfe.tar.gz vyos-1x-cae2717e9a608a1706e9dc134f7d560453ec4bfe.zip | |
Merge pull request #4832 from kumvijaya/current
T7981: prs conflict check workflow updated to use schedule checks
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml index 9b0b97423..91e786c3c 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -1,15 +1,24 @@ -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 + with: + action-ref: 'current' |