summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorkumvijaya <kumvijaya@gmail.com>2025-11-04 13:16:35 +0530
committerkumvijaya <kumvijaya@gmail.com>2025-11-04 13:16:35 +0530
commit6f5f7ce415563b4583407893fdc05b1417c193ce (patch)
treeafd1554aa7c3c4c0fd3cdba73c402de8d3c9c437 /.github/workflows
parente1b7b865a63454ae4b8f840c94ab599633faaf7f (diff)
downloadvyos-1x-6f5f7ce415563b4583407893fdc05b1417c193ce.tar.gz
vyos-1x-6f5f7ce415563b4583407893fdc05b1417c193ce.zip
T7981: prs conflict check workflow updated to use schedule
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/check-pr-conflicts.yml23
1 files changed, 15 insertions, 8 deletions
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