mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
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:
commit
74c1f0724b
17
.github/workflows/check-open-prs-conflict.yml
vendored
17
.github/workflows/check-open-prs-conflict.yml
vendored
@ -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
|
||||
2
.github/workflows/check-pr-conflicts.yml
vendored
2
.github/workflows/check-pr-conflicts.yml
vendored
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user