Skip to content

Commit

Permalink
allow jsonrainbow / json-schema version 6
Browse files Browse the repository at this point in the history
  • Loading branch information
tacman authored and localheinz committed Dec 4, 2024
1 parent fcf6985 commit 9ddc9b9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,10 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove incompatible dependencies with composer"
if: "matrix.dependencies != 'locked'"
run: "composer remove composer/composer --ansi --dev --no-interaction --no-progress"

- name: "Remove platform configuration with composer"
if: "matrix.dependencies != 'locked'"
run: "composer config platform.php --ansi --unset"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`2.44.0...main`][2.44.0...main].
### Changed

- Updated `schema.json` ([#1405]), by [@ergebnis-bot]
- Allowed installation of `justinrainbow/json-schema:^6.0.0` ([#1410]), by [@tacman]

## [`2.44.0`][2.44.0]

Expand Down Expand Up @@ -1256,6 +1257,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#1363]: https://github.com/ergebnis/composer-normalize/pull/1363
[#1381]: https://github.com/ergebnis/composer-normalize/pull/1381
[#1405]: https://github.com/ergebnis/composer-normalize/pull/1405
[#1410]: https://github.com/ergebnis/composer-normalize/pull/1410

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand All @@ -1264,4 +1266,5 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
[@svenluijten]: https://github.com/svenluijten
[@tacman]: https://github.com/tacman
[@TravisCarden]: https://github.com/TravisCarden
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ergebnis/json": "^1.4.0",
"ergebnis/json-normalizer": "^4.8.0",
"ergebnis/json-printer": "^3.7.0",
"justinrainbow/json-schema": "^5.2.12",
"justinrainbow/json-schema": "^5.2.12 || ^6.0.0",
"localheinz/diff": "^1.2.0"
},
"require-dev": {
Expand Down
21 changes: 8 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9ddc9b9

Please sign in to comment.