Skip to content

Commit

Permalink
Merge pull request #825 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz authored Dec 5, 2021
2 parents 9e11442 + abbc871 commit 0ac8d06
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
- "main"

env:
COMPOSER_VERSION: "2.1.12"
COMPOSER_VERSION: "2.1.14"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ For a full diff see [`2.16.0...2.17.0`][2.16.0...2.17.0].

- Updated `schema.json` ([#816]), by [@ergebnis-bot]

### Fixed

- Required `composer/composer:2.1.14` for compiling `composer-normalize.phar` ([#825]), by [@localheinz]

## [`2.16.0`][2.16.0]

For a full diff see [`2.15.0...2.16.0`][2.15.0...2.16.0].
Expand Down Expand Up @@ -756,6 +760,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#804]: https://github.com/ergebnis/composer-normalize/pull/804
[#807]: https://github.com/ergebnis/composer-normalize/pull/807
[#816]: https://github.com/ergebnis/composer-normalize/pull/816
[#825]: https://github.com/ergebnis/composer-normalize/pull/825

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSER_VERSION:=2.1.12
COMPOSER_VERSION:=2.1.14

.PHONY: it
it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^2.1.12",
"composer/composer": "^2.1.14",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.14.0",
"ergebnis/test-util": "^1.5.0",
Expand Down
41 changes: 21 additions & 20 deletions composer.lock

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

0 comments on commit 0ac8d06

Please sign in to comment.