alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-23 21:12:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update GitHub workflows from Master

Browse Source 
Backport fixes from:
 - #11780
 - #11779
 - #11769
 - #11733
 - #11515
This commit is contained in:
Joshua M. Boniface
2024-05-25 11:55:48 -04:00
parent 2eece01acc
commit bcf884ccfa
7 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull-request-conflict.yml vendored
View File

@@ -15,7 +15,7 @@ jobs:
if: ${{ github.repository == 'jellyfin/jellyfin' }}
steps:
- name: Apply label
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
uses: eps1lon/actions-label-merge-conflict@6d74047dcef155976a15e4a124dde2c7fe0c5522 # v3.0.1
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with:
dirtyLabel: 'merge conflict'