mirror of
https://github.com/pi-hole/docs.git
synced 2026-04-17 23:53:15 +01:00
64f2669976
Bumps the github_action-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [actions/setup-python](https://github.com/actions/setup-python) and [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict). Updates `actions/checkout` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.2) Updates `actions/setup-python` from 5.0.0 to 5.1.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.0.0...v5.1.0) Updates `eps1lon/actions-label-merge-conflict` from 2.1.0 to 3.0.0 - [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/v2.1.0...v3.0.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_action-dependencies - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_action-dependencies - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-major dependency-group: github_action-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
22 lines
819 B
YAML
22 lines
819 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.0
|
|
with:
|
|
dirtyLabel: "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."
|