diff options
| author | Walker Selby <git@walkerselby.com> | 2023-10-29 23:24:08 +0000 |
|---|---|---|
| committer | Walker Selby <git@walkerselby.com> | 2023-10-29 23:24:08 +0000 |
| commit | d22207e0075cf7f3e3e6472e57802c80a2339d97 (patch) | |
| tree | e0cdd6581fd7248b14bc4a942254f27e2c89fecb /.github | |
| parent | 0dc3844df66202714999d28c0afaf7d186a0befc (diff) | |
| download | SkyHanni-REPO-d22207e0075cf7f3e3e6472e57802c80a2339d97.tar.gz SkyHanni-REPO-d22207e0075cf7f3e3e6472e57802c80a2339d97.tar.bz2 SkyHanni-REPO-d22207e0075cf7f3e3e6472e57802c80a2339d97.zip | |
Add Action for Merge Conflicts
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/label-merge-conflict.yml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml new file mode 100644 index 0000000..16fbd88 --- /dev/null +++ b/.github/workflows/label-merge-conflict.yml @@ -0,0 +1,26 @@ +name: "Merge Conflict Label" +on: + # So that PRs touching the same files as the push are updated + push: + branches: [ main ] + # 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: [ opened, synchronize ] + +jobs: + conflicts: + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + steps: + - name: Update PRs with conflict labels + uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: "Merge Conflicts" + #removeOnDirtyLabel: "PR: ready to ship" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly." |