[5.4] Regression fix for security fix in 5.4.6 and 6.1.1 #1409
Workflow file for this run
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: "Detect 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 resolved | |
| # 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 dirty | |
| uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3 | |
| with: | |
| dirtyLabel: "Conflicting Files" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." |