Skip to content

Commit

Permalink
Enhancement: Update composer/composer
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Nov 22, 2021
1 parent d4112fe commit 77abc83
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 54 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.0.13"
COMPOSER_VERSION: "2.1.12"
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.0.13"
COMPOSER_VERSION: "2.1.12"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"

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

### Changed

* Required `composer/composer:2.1.12` for compiling `composer-normalize.phar` ([#804]), by [@localheinz]
* Dropped support for `composer/composer:^1.0.0` ([#807]), by [@localheinz]

## [`2.15.0`][2.15.0]
Expand Down Expand Up @@ -736,6 +737,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#744]: https://github.com/ergebnis/composer-normalize/pull/744
[#750]: https://github.com/ergebnis/composer-normalize/pull/750
[#754]: https://github.com/ergebnis/composer-normalize/pull/754
[#804]: https://github.com/ergebnis/composer-normalize/pull/804
[#807]: https://github.com/ergebnis/composer-normalize/pull/807

[@core23]: https://github.com/core23
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.0.13
COMPOSER_VERSION:=2.1.12

.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.0.13",
"composer/composer": "^2.1.12",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.14.0",
"ergebnis/test-util": "^1.5.0",
Expand Down
124 changes: 74 additions & 50 deletions composer.lock

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

0 comments on commit 77abc83

Please sign in to comment.