Skip to content

Commit

Permalink
Merge release 2.0.2 into 2.1.x (#519)
Browse files Browse the repository at this point in the history
  • Loading branch information
derrabus authored Jan 21, 2025
2 parents 85f5b7f + f7f1e12 commit be489ac
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
21 changes: 21 additions & 0 deletions .github/workflows/website-schema.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

name: "Website config validation"

on:
pull_request:
branches:
- "*.x"
paths:
- ".doctrine-project.json"
- ".github/workflows/website-schema.yml"
push:
branches:
- "*.x"
paths:
- ".doctrine-project.json"
- ".github/workflows/website-schema.yml"

jobs:
json-validate:
name: "Validate JSON schema"
uses: "doctrine/.github/.github/workflows/[email protected]"
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": "^8.1",
"doctrine/persistence": "^3.1",
"doctrine/persistence": "^3.1 || ^4.0",
"psr/log": "^1.1 || ^2 || ^3"
},
"conflict": {
Expand Down

0 comments on commit be489ac

Please sign in to comment.