Skip to content

Commit

Permalink
Merge pull request #582 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Require and use composer/composer:^1.10.15
  • Loading branch information
ergebnis-bot authored Oct 21, 2020
2 parents 8c650dd + 7af6491 commit 4b77c0e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 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: "1.10.13"
COMPOSER_VERSION: "1.10.15"
ERGEBNIS_BOT_NAME: "ergebnis-bot"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
- "**"

env:
COMPOSER_VERSION: "1.10.13"
COMPOSER_VERSION: "1.10.15"
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.8.2...2.9.0`][2.8.2...2.9.0].

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

### Fixed

* Required at least `composer/composer:^1.10.15` and use `composer/composer:1.10.15` for `composer-normalize.phar` ([#582]), by [@localheinz]

## [`2.8.2`][2.8.2]

For a full diff see [`2.8.1...2.8.2`][2.8.1...2.8.2].
Expand Down Expand Up @@ -570,6 +574,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#529]: https://github.com/ergebnis/composer-normalize/pull/529
[#554]: https://github.com/ergebnis/composer-normalize/pull/554
[#572]: https://github.com/ergebnis/composer-normalize/pull/572
[#582]: https://github.com/ergebnis/composer-normalize/pull/582

[@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:=1.10.13
COMPOSER_VERSION:=1.10.15

.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": "^1.10.13 || ^2.0.0",
"composer/composer": "^1.10.15 || ^2.0.0",
"composer/package-versions-deprecated": "^1.11.99",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.3.0",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

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

0 comments on commit 4b77c0e

Please sign in to comment.