Skip to content

Commit d54a059

Browse files
committed
Merge branch '4.x' into 5.x
2 parents 8510e51 + 9933929 commit d54a059

6 files changed

Lines changed: 28 additions & 14 deletions

File tree

.github/dependabot.yml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1-
# Please see the documentation for all configuration options:
2-
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3-
41
version: 2
52
updates:
6-
7-
- package-ecosystem: "github-actions"
8-
directory: "/"
3+
- package-ecosystem: github-actions
4+
directory: /
95
schedule:
10-
interval: "weekly"
6+
interval: weekly
117
open-pull-requests-limit: 10
128
cooldown:
139
default-days: 7
1410
labels:
15-
- "dependencies"
16-
- "github_actions"
11+
- dependencies
12+
13+
- package-ecosystem: composer
14+
directory: /
15+
schedule:
16+
interval: weekly
17+
open-pull-requests-limit: 0
18+
cooldown:
19+
default-days: 7
20+
labels:
21+
- dependencies
22+
23+
- package-ecosystem: npm
24+
directory: /
25+
schedule:
26+
interval: weekly
27+
open-pull-requests-limit: 0
28+
cooldown:
29+
default-days: 7
30+
labels:
31+
- dependencies

.github/workflows/fix-code-style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
# persist-credentials: true is required so `git-auto-commit-action` below
1616
# can push the reformatted files back to the branch.
1717
- name: Checkout code
18-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.2 # zizmor: ignore[artipacked]
18+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 # zizmor: ignore[artipacked]
1919

2020
- name: Cache Composer dependencies
2121
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5

.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
# persist-credentials: true is required so `git-auto-commit-action` below
1616
# can push the CHANGELOG update.
1717
- name: Checkout code
18-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.2 # zizmor: ignore[artipacked]
18+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 # zizmor: ignore[artipacked]
1919
with:
2020
ref: main
2121

.github/workflows/zizmor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ jobs:
1818
runs-on: ubuntu-latest
1919
permissions:
2020
contents: read
21+
security-events: write
2122
steps:
2223
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2324
with:
2425
persist-credentials: false
2526

2627
- uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
27-
with:
28-
advanced-security: false

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
.phpunit.cache
55
.vscode
66
build
7-
composer.lock
87
coverage
98
docs
109
node_modules

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
min-release-age=7

0 commit comments

Comments
 (0)