Merge remote-tracking branch 'upstream/master' #96
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: Automation | |
| concurrency: | |
| group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | |
| cancel-in-progress: true | |
| on: | |
| push: | |
| branches: | |
| - master | |
| pull_request_target: | |
| jobs: | |
| conflicts: | |
| name: Merge conflict labeling | |
| runs-on: ubuntu-latest | |
| if: ${{ github.repository == 'jellyfin/jellyfin-web' }} | |
| steps: | |
| - uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2 | |
| with: | |
| dirtyLabel: 'merge conflict' | |
| commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' | |
| repoToken: ${{ secrets.JF_BOT_TOKEN }} |