diff options
author | Christian Breunig <christian@breunig.cc> | 2024-06-15 14:38:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-15 14:38:22 +0200 |
commit | 2b6820126d4891d5f7d2c53b66ba08468fe82f55 (patch) | |
tree | 7155e9133fb4459204efa3af009fd468f6e6a21e /.github/workflows/check-pr-conflicts.yml | |
parent | a7608991a8b381ad389e5492713e61a6ce3fd5d3 (diff) | |
parent | dcb5d50abd66e207156f371fb80e6497d33390e8 (diff) | |
download | vyos-1x-2b6820126d4891d5f7d2c53b66ba08468fe82f55.tar.gz vyos-1x-2b6820126d4891d5f7d2c53b66ba08468fe82f55.zip |
Merge pull request #3649 from vyos/mergify/bp/equuleus/pr-36471.3.8
T6487: updated central workflows to use equuleus branch (backport #3647)
Diffstat (limited to '.github/workflows/check-pr-conflicts.yml')
-rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml new file mode 100644 index 000000000..d5186e71d --- /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@equuleus + secrets: inherit |