Skip to content

Commit

Permalink
Merge pull request #554 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Require at least composer/composer:^1.10.13
  • Loading branch information
ergebnis-bot authored Sep 22, 2020
2 parents ef97bd8 + a33c60d commit 0a25a22
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 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.8"
COMPOSER_VERSION: "1.10.13"
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.8"
COMPOSER_VERSION: "1.10.13"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"

Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.8.1...main`][2.8.1...main].
For a full diff see [`2.8.2...main`][2.8.2...main].

## [`2.8.2`][2.8.2]

For a full diff see [`2.8.1...2.8.2`][2.8.1...2.8.2].

### Changed

* Require at least `composer/composer:^1.10.13` ([#554]), by [@localheinz]

## [`2.8.1`][2.8.1]

Expand Down Expand Up @@ -443,6 +451,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.7.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.7.0
[2.8.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.0
[2.8.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.1
[2.8.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.2

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
Expand Down Expand Up @@ -485,7 +494,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.6.1...2.7.0]: https://github.com/ergebnis/composer-normalize/compare/2.6.1...2.7.0
[2.7.0...2.8.0]: https://github.com/ergebnis/composer-normalize/compare/2.7.0...2.8.0
[2.8.0...2.8.1]: https://github.com/ergebnis/composer-normalize/compare/2.8.0...2.8.1
[2.8.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.8.1...main
[2.8.1...2.8.2]: https://github.com/ergebnis/composer-normalize/compare/2.8.1...2.8.2
[2.8.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.8.2...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -548,6 +558,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#515]: https://github.com/ergebnis/composer-normalize/pull/515
[#526]: https://github.com/ergebnis/composer-normalize/pull/526
[#529]: https://github.com/ergebnis/composer-normalize/pull/529
[#554]: https://github.com/ergebnis/composer-normalize/pull/554

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

.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.8 || ^2.0.0",
"composer/composer": "^1.10.13 || ^2.0.0",
"composer/package-versions-deprecated": "^1.11.99",
"ergebnis/phpstan-rules": "~0.15.2",
"ergebnis/test-util": "^1.1.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 0a25a22

Please sign in to comment.