diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-05-26 22:11:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-26 22:11:14 +0300 |
| commit | eb3661d2fe4d65fdfea6ddc0b4bd46be40b78c5f (patch) | |
| tree | 64b542ed4ddf7eb30dfac418140cb9b4b11cfb05 | |
| parent | 76967730f459a57b8ce505a87dd620e5668fe941 (diff) | |
| parent | e5bd9871250556e591b70f9e2782ae080c1c6f22 (diff) | |
| download | vyos-utils-eb3661d2fe4d65fdfea6ddc0b4bd46be40b78c5f.tar.gz vyos-utils-eb3661d2fe4d65fdfea6ddc0b4bd46be40b78c5f.zip | |
Merge pull request #35 from kumvijaya/current
T7445: added prs conflict check caller workflows
| -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 + |