upstream merge 15/11 #2
Workflow file for this run
This file contains 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: Check Merge Conflicts | ||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| - synchronize | ||
| - reopened | ||
| - ready_for_review | ||
| jobs: | ||
| Label: | ||
| if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'DeltaV-Bot' ) | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check for Merge Conflicts | ||
| uses: eps1lon/[email protected] | ||
| with: | ||
| <<<<<<< HEAD:.github/workflows/conflict-labeler.yml | ||
| dirtyLabel: "Status: Merge Conflict" | ||
| ======= | ||
| dirtyLabel: "S: Merge Conflict" | ||
| >>>>>>> 75ec546550 (Update Label workflows to use new labels (#33310)):.github/workflows/labeler-conflict.yml | ||
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | ||
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." | ||
