Skip to content

Commit

Permalink
Merge pull request #871 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz authored Jan 21, 2022
2 parents dee2fe8 + b18c47b commit ba06ab8
Show file tree
Hide file tree
Showing 6 changed files with 17 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: "2.2.3"
COMPOSER_VERSION: "2.2.5"
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: "2.2.3"
COMPOSER_VERSION: "2.2.5"
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 @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

For a full diff see [`2.23.0...main`][2.23.0...main].

### Fixed

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

## [`2.23.0`][2.23.0]

For a full diff see [`2.22.0...2.23.0`][2.22.0...2.23.0].
Expand Down Expand Up @@ -832,6 +836,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#858]: https://github.com/ergebnis/composer-normalize/pull/858
[#863]: https://github.com/ergebnis/composer-normalize/pull/863
[#864]: https://github.com/ergebnis/composer-normalize/pull/864
[#871]: https://github.com/ergebnis/composer-normalize/pull/871

[@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.2.3
COMPOSER_VERSION:=2.2.5

.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 @@ -29,7 +29,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^2.2.3",
"composer/composer": "^2.2.5",
"ergebnis/license": "^1.2.0",
"ergebnis/php-cs-fixer-config": "^3.4.0",
"fakerphp/faker": "^1.17.0",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

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

0 comments on commit ba06ab8

Please sign in to comment.