Skip to content

Commit

Permalink
Merge pull request #1171 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz committed Sep 15, 2023
2 parents 777fc57 + e43e4b2 commit 536a7e1
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 @@ -165,7 +165,7 @@ jobs:

env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_VERSION: "2.6.2"
COMPOSER_VERSION: "2.6.3"

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 @@ -26,7 +26,7 @@ jobs:
env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc"
COMPOSER_VERSION: "2.6.2"
COMPOSER_VERSION: "2.6.3"
GPG_KEYS: ".build/phar/keys.asc"
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"

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

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

### Fixed

- Updated `composer/composer` ([#1171]), by [@localheinz]

## [`2.36.0`][2.36.0]

For a full diff see [`2.35.0...2.36.0`][2.35.0...2.36.0].
Expand Down Expand Up @@ -1117,6 +1121,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#1155]: https://github.com/ergebnis/composer-normalize/pull/1155
[#1158]: https://github.com/ergebnis/composer-normalize/pull/1158
[#1170]: https://github.com/ergebnis/composer-normalize/pull/1170
[#1171]: https://github.com/ergebnis/composer-normalize/pull/1171

[@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.6.2
COMPOSER_VERSION:=2.6.3

.PHONY: it
it: refactoring coding-standards security-analysis static-code-analysis tests ## Runs the refactoring, coding-standards, security-analysis, 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 @@ -32,7 +32,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^2.6.2",
"composer/composer": "^2.6.3",
"ergebnis/license": "^2.2.0",
"ergebnis/php-cs-fixer-config": "^5.15.1",
"ergebnis/phpunit-slow-test-detector": "^2.3.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 536a7e1

Please sign in to comment.