mirror of
https://github.com/jellyfin/jellyfin-vue.git
synced 2024-12-12 00:06:13 +00:00
Merge pull request #796 from jellyfin/merge-conflicts
ci(github): tag PRs with merge conflicts automatically
This commit is contained in:
commit
9ad3e3a48a
20
.github/labeler.yml
vendored
Normal file
20
.github/labeler.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
tests:
|
||||
- "**/*.spec.js"
|
||||
|
||||
github_actions:
|
||||
- ".github/workflows/*"
|
||||
|
||||
vuex:
|
||||
- "store/**/*.ts"
|
||||
|
||||
plugins:
|
||||
- "plugins/**/*.ts"
|
||||
|
||||
vue:
|
||||
- "**/*.vue"
|
||||
|
||||
docker:
|
||||
- "Dockerfile*"
|
||||
|
||||
ui:
|
||||
- any: ["components/**/*.vue", "layouts/**/*.vue", "pages/**/*.vue"]
|
11
.github/workflows/label.yml
vendored
Normal file
11
.github/workflows/label.yml
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
name: "Label pull requests"
|
||||
on:
|
||||
- pull_request_target
|
||||
|
||||
jobs:
|
||||
triage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/labeler@main
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
15
.github/workflows/merge-conflicts.yml
vendored
Normal file
15
.github/workflows/merge-conflicts.yml
vendored
Normal file
@ -0,0 +1,15 @@
|
||||
name: "Merge Conflicts"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
jobs:
|
||||
triage:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository == 'jellyfin/jellyfin-vue'
|
||||
steps:
|
||||
- uses: mschilde/auto-label-merge-conflicts@master
|
||||
with:
|
||||
CONFLICT_LABEL_NAME: "merge conflict"
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
Loading…
Reference in New Issue
Block a user