Skip to content

Commit 4a8ac0a

Browse files
committed
Merge remote-tracking branch 'origin/12.0.x' into 13.0.x
2 parents 3cc2cef + 74f8512 commit 4a8ac0a

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
php-version: "${{ matrix.php-version }}"
3333

3434
- name: "Cache dependencies installed with composer"
35-
uses: "actions/cache@v2"
35+
uses: "actions/cache@v4"
3636
with:
3737
path: "~/.composer/cache"
3838
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -65,7 +65,7 @@ jobs:
6565
php-version: "${{ matrix.php-version }}"
6666

6767
- name: "Cache dependencies installed with composer"
68-
uses: "actions/cache@v2"
68+
uses: "actions/cache@v4"
6969
with:
7070
path: "~/.composer/cache"
7171
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
@@ -109,7 +109,7 @@ jobs:
109109
php-version: "${{ matrix.php-version }}"
110110

111111
- name: "Cache dependencies installed with composer"
112-
uses: "actions/cache@v2"
112+
uses: "actions/cache@v4"
113113
with:
114114
path: "~/.composer/cache"
115115
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -148,7 +148,7 @@ jobs:
148148
php-version: "${{ matrix.php-version }}"
149149

150150
- name: "Cache dependencies installed with composer"
151-
uses: "actions/cache@v2"
151+
uses: "actions/cache@v4"
152152
with:
153153
path: "~/.composer/cache"
154154
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"

.github/workflows/website-schema.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
name: "Website config validation"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- "*.x"
8+
paths:
9+
- ".doctrine-project.json"
10+
- ".github/workflows/website-schema.yml"
11+
push:
12+
branches:
13+
- "*.x"
14+
paths:
15+
- ".doctrine-project.json"
16+
- ".github/workflows/website-schema.yml"
17+
18+
jobs:
19+
json-validate:
20+
name: "Validate JSON schema"
21+
uses: "doctrine/.github/.github/workflows/[email protected]"

0 commit comments

Comments
 (0)