Skip to content

Commit be489ac

Browse files
authored
Merge release 2.0.2 into 2.1.x (#519)
2 parents 85f5b7f + f7f1e12 commit be489ac

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

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/website-schema.yml@7.1.0"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"require": {
1717
"php": "^8.1",
18-
"doctrine/persistence": "^3.1",
18+
"doctrine/persistence": "^3.1 || ^4.0",
1919
"psr/log": "^1.1 || ^2 || ^3"
2020
},
2121
"conflict": {

0 commit comments

Comments
 (0)