Skip to content

Commit

Permalink
Merge pull request #922 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz authored Apr 20, 2022
2 parents 170121e + 04b078d commit 854ca67
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:

env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_VERSION: "2.3.1"
COMPOSER_VERSION: "2.3.5"

steps:
- name: "Checkout"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc"
COMPOSER_VERSION: "2.3.1"
COMPOSER_VERSION: "2.3.5"
GPG_KEYS: ".build/phar/keys.asc"
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"

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

- Updated `schema.json` ([#916]), by [@ergebnis-bot]
- Required `composer/composer:2.3.5` for compiling `composer-normalize.phar` ([#922]), by [@localheinz]

### Fixed

Expand Down Expand Up @@ -903,6 +904,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#915]: https://github.com/ergebnis/composer-normalize/pull/915
[#916]: https://github.com/ergebnis/composer-normalize/pull/916
[#920]: https://github.com/ergebnis/composer-normalize/pull/920
[#922]: https://github.com/ergebnis/composer-normalize/pull/922

[@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.3.1
COMPOSER_VERSION:=2.3.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.3.1",
"composer/composer": "^2.3.5",
"ergebnis/license": "^1.2.0",
"ergebnis/php-cs-fixer-config": "^4.4.0",
"fakerphp/faker": "^1.19.0",
Expand Down
103 changes: 52 additions & 51 deletions composer.lock

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

0 comments on commit 854ca67

Please sign in to comment.