diff options
| author | Walker Selby <git@walkerselby.com> | 2023-10-29 22:31:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 23:31:05 +0100 |
| commit | 87e8eaf2ab8353fe2762875ced9af0d24ff6d112 (patch) | |
| tree | 3d53cb5c899cc430ac359739d73559879473f37e /.github/workflows | |
| parent | 51552fc700c00f5ff88eb8a49fce84360f41915a (diff) | |
| download | skyhanni-87e8eaf2ab8353fe2762875ced9af0d24ff6d112.tar.gz skyhanni-87e8eaf2ab8353fe2762875ced9af0d24ff6d112.tar.bz2 skyhanni-87e8eaf2ab8353fe2762875ced9af0d24ff6d112.zip | |
GitHub Action: Merge Conflict Labels (#649)
auto manage merge conflict label #649
Diffstat (limited to '.github/workflows')
| -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 000000000..d4e693f7b --- /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: [ beta ] + # 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." |