diff options
| author | kumvijaya <kumvijaya@gmail.com> | 2025-09-27 23:44:56 +0530 |
|---|---|---|
| committer | kumvijaya <kumvijaya@gmail.com> | 2025-09-27 23:44:56 +0530 |
| commit | 46d99f7df61bae469777dcad4ce00efbc25754ee (patch) | |
| tree | f9bac2fc592255f9fd9d4d7f0819c8e58ee0493c | |
| parent | 137b20e4253f02dc7e394b592291ab4f1fc5da9a (diff) | |
| download | vyos-build-46d99f7df61bae469777dcad4ce00efbc25754ee.tar.gz vyos-build-46d99f7df61bae469777dcad4ce00efbc25754ee.zip | |
T7878: Using mergify rule to handle conflict checks for private repo
| -rw-r--r-- | .github/mergify.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000..985cf098 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,10 @@ +pull_request_rules: + - name: Label conflicting pull requests + description: Add a label to a pull request with conflict to spot it easily + conditions: + - conflict + - '-closed' + actions: + label: + toggle: + - conflict diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml index f09e6641..9b0b9742 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -9,6 +9,7 @@ permissions: contents: read jobs: - check-pr-conflict-call: + check-pr-conflict: + if: github.repository_owner == 'vyos' uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current secrets: inherit |