mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2025-12-24 02:39:18 -05:00
f46a763152
* feat(ci): tidy up workflows and implement a consistent style all workflows now use ubuntu-24.04 as the runner type to match the release workflows codeql.yml - bump actions to v3 - add least-privilege perms + concurrency to stop duplicate runs - ignore docs only changes conflict_labeler.yml - run on opened, reopened, and synchronize - bump action version - add concurrency group to avoid duplicate labeling cypress.yml - skip docs-only changes; don’t run on draft PRs - add concurrency to stop duplicate runs + 10m timeout docs-deploy.yml - add configure-pages@v5 and bump upload-pages-artifact to v4 - set explicit pages/id-token perms + concurrency - minor cleanups (working-directory, ubuntu-24.04) helm.yml - switch oras discover to oras manifest fetch - add concurrency to stop duplicate runs lint-helm-charts.yml - bump action versions - enforce version bumps (--check-version-increment=true) - add least-privilege perms + concurrency to stop duplicate runs support.yml - add least-privilege perms test-docs-deploy.yml - add least-privilege perms + concurrency to stop duplicate runs * fixed line 5 syntax error * Updated based on comments from @M0NsTeRRR in PR-1905 discussion * updated based on 2nd review from @M0NsTeRRR in PR-1905 * Merge of PR-1904 and PR-1905 * chore(pnpm-lock.yaml): updated the pnpm-lockfile * ci(release.yml): fix the latest tag to use context labels * ci: fix new lines at eof, removed cypress timeout, removed legacy qemu actions * @M0NsTeRRR self review Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> * fix: support workflow Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> * fix: newline --------- Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> Co-authored-by: Ludovic Ortega <ludovic.ortega@adminafk.fr> Co-authored-by: Ludovic Ortega <github@mail.adminafk.fr>
33 lines
763 B
YAML
33 lines
763 B
YAML
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@v3
|
|
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 }}'
|