Merge pull request #1025 from kumvijaya/current

T7748: conflict check workflow updated to use marketplace action along with increased wait/retry
This commit is contained in:
Vijayakumar A 2025-09-11 00:43:24 +05:30 committed by GitHub
commit 74c1f0724b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 18 deletions

View File

@ -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

View File

@ -10,5 +10,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