mirror of
https://github.com/pi-hole/pi-hole
synced 2024-11-18 22:28:18 +00:00
4add164d43
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases) - [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md) - [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
22 lines
823 B
YAML
22 lines
823 B
YAML
name: "Check for merge conflicts"
|
|
on:
|
|
# So that PRs touching the same files as the push are updated
|
|
push:
|
|
# So that the `dirtyLabel` is removed if conflicts are resolve
|
|
# We recommend `pull_request_target` so that github secrets are available.
|
|
# In `pull_request` we wouldn't be able to change labels of fork PRs
|
|
pull_request_target:
|
|
types: [synchronize]
|
|
|
|
jobs:
|
|
main:
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Check if PRs are have merge conflicts
|
|
uses: eps1lon/actions-label-merge-conflict@v3.0.2
|
|
with:
|
|
dirtyLabel: "PR: Merge Conflict"
|
|
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."
|