diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-05-26 15:20:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-26 15:20:00 +0100 |
| commit | 442eb09a17c338296ca4cdc10013acaf9cb36662 (patch) | |
| tree | 88cdb7265f6741629c05c969b77b794e586011d1 | |
| parent | e1b570dfbdb5703688b445f9d54160754cc2d190 (diff) | |
| parent | 2bd511731245cb8c7e6b5a4e837ef54dfa2f1e2d (diff) | |
| download | vyos1x-config-442eb09a17c338296ca4cdc10013acaf9cb36662.tar.gz vyos1x-config-442eb09a17c338296ca4cdc10013acaf9cb36662.zip | |
Merge pull request #44 from kumvijaya/current
T7445: added prs conflict check caller workflow
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 14 |
2 files changed, 31 insertions, 0 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml new file mode 100644 index 0000000..52b1193 --- /dev/null +++ b/.github/workflows/check-open-prs-conflict.yml @@ -0,0 +1,17 @@ +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 diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml new file mode 100644 index 0000000..5417fbb --- /dev/null +++ b/.github/workflows/check-pr-conflicts.yml @@ -0,0 +1,14 @@ +name: "PR Conflicts checker" +on: + pull_request_target: + types: [synchronize] + +permissions: + pull-requests: write + contents: read + +jobs: + check-pr-conflict-call: + uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current + secrets: inherit + |