mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2025-12-24 02:39:18 -05:00
2e6a19d3b5
* ci: updated all workflows to be pineed to commit hashes ahead of renovate connection * ci: update doc links regex * ci: bump version for codeql-action * ci: bump version for action/cache to v4.2.0 * ci: adding package-manager-cache: false to the node v5 setup steps * ci: remove the --include to test precedence as it was overriding * chore: added missing @ from commit hash * ci: updates to shas to bring up to latest, also update to renovate config to account for major versions * chore: update renovate global minimum age settings * updated node sha * Apply suggestion from @M0NsTeRRR Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> * Apply suggestion from @M0NsTeRRR Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> * Apply suggestion from @M0NsTeRRR Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> * Apply suggestion from @M0NsTeRRR * Apply suggestion from @M0NsTeRRR --------- Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>
35 lines
896 B
YAML
35 lines
896 B
YAML
---
|
|
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
|
name: Merge Conflict Labeler
|
|
|
|
on:
|
|
push:
|
|
branches: [develop]
|
|
|
|
pull_request_target:
|
|
branches: [develop]
|
|
types: [opened, synchronize, reopened]
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
concurrency:
|
|
group: merge-conflict-${{ github.ref }}
|
|
cancel-in-progress: true
|
|
|
|
jobs:
|
|
label:
|
|
name: Labeling
|
|
runs-on: ubuntu-24.04
|
|
timeout-minutes: 10
|
|
permissions:
|
|
contents: read
|
|
pull-requests: write
|
|
steps:
|
|
- name: Apply label
|
|
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
|
|
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.GITHUB_TOKEN }}'
|