Skip to content

Commit 370afee

Browse files
authored
Merge main into 16-helpop
2 parents c0fffc6 + 5db9e24 commit 370afee

File tree

3 files changed

+121
-91
lines changed

3 files changed

+121
-91
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: pr-auto-update
2+
on:
3+
push: {}
4+
5+
jobs:
6+
pr-auto-update:
7+
name: Automatic PR Updater
8+
runs-on: ubuntu-latest
9+
permissions:
10+
pull-requests: write
11+
contents: write
12+
steps:
13+
- uses: CSSUoB/[email protected]
14+
env:
15+
GITHUB_TOKEN: '${{ secrets.PR_AUTO_UPDATE_TOKEN }}'
16+
PR_FILTER: 'labelled'
17+
PR_LABELS: 'sync'
18+
MERGE_CONFLICT_ACTION: 'label'
19+
MERGE_CONFLICT_LABEL: 'conflict'

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repos:
1111
- id: hadolint
1212

1313
- repo: https://github.com/renovatebot/pre-commit-hooks
14-
rev: 40.32.7
14+
rev: 40.49.5
1515
hooks:
1616
- id: renovate-config-validator
1717
args: [--strict]
@@ -29,7 +29,7 @@ repos:
2929
- id: gitlint-ci
3030

3131
- repo: https://github.com/gitleaks/gitleaks
32-
rev: v8.26.0
32+
rev: v8.27.2
3333
hooks:
3434
- id: gitleaks
3535

@@ -74,15 +74,15 @@ repos:
7474
stages: [manual]
7575

7676
- repo: https://github.com/astral-sh/ruff-pre-commit
77-
rev: v0.11.11
77+
rev: v0.11.13
7878
hooks:
7979
- id: ruff
8080
args: [--fix]
8181

8282
- id: ruff-format
8383

8484
- repo: https://github.com/astral-sh/uv-pre-commit
85-
rev: 0.7.8
85+
rev: 0.7.12
8686
hooks:
8787
- id: uv-lock
8888
always_run: true

0 commit comments

Comments
 (0)