diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-04 13:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 13:32:53 +0200 |
| commit | 1678ecdc7bff0ac89b8dfd6608097156f92b9f3a (patch) | |
| tree | 851e4597f3581ff27b4a53092bd85e5089948bcf | |
| parent | adda3d86080bb3b8fe26424c7d829e40eb9e2b23 (diff) | |
| parent | 035bc9588d319ef8db434fb06caaad2df8eb2a19 (diff) | |
| download | vyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.tar.gz vyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.zip | |
Merge pull request #1266 from c-po/pr-conflict-backport
GitHub: enable PR conflict workflow - backport from current
| -rw-r--r-- | .github/workflows/pr-conflicts.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml new file mode 100644 index 000000000..72ff3969b --- /dev/null +++ b/.github/workflows/pr-conflicts.yml @@ -0,0 +1,18 @@ +name: "PR Conflicts checker" +on: + pull_request_target: + types: [synchronize] + +jobs: + Conflict_Check: + name: 'Check PR status: conflicts and resolution' + runs-on: ubuntu-18.04 + steps: + - name: check if PRs are dirty + uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: "state: conflict" + removeOnDirtyLabel: "state: conflict resolved" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." |