Skip to content

Commit

Permalink
Merge pull request #1292 from ergebnis/feature/composer
Browse files Browse the repository at this point in the history
Enhancement: Update `composer/composer`
  • Loading branch information
localheinz committed Feb 8, 2024
2 parents 7ad34f8 + 46b68e4 commit 38995f4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Expand Up @@ -162,7 +162,7 @@ jobs:

env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_VERSION: "2.6.6"
COMPOSER_VERSION: "2.7.0"

steps:
- name: "Checkout"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
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.6"
COMPOSER_VERSION: "2.7.0"
GPG_KEYS: ".build/phar/keys.asc"
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
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.42.0...main`][2.42.0...main].

### Changed

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

## [`2.42.0`][2.42.0]

For a full diff see [`2.41.1...2.42.0`][2.40.0...2.42.0].
Expand Down Expand Up @@ -1222,6 +1226,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#1277]: https://github.com/ergebnis/composer-normalize/pull/1277
[#1278]: https://github.com/ergebnis/composer-normalize/pull/1278
[#1279]: https://github.com/ergebnis/composer-normalize/pull/1279
[#1292]: https://github.com/ergebnis/composer-normalize/pull/1292

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
2 changes: 1 addition & 1 deletion Makefile
@@ -1,4 +1,4 @@
COMPOSER_VERSION:=2.6.6
COMPOSER_VERSION:=2.7.0

.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
Expand Up @@ -33,7 +33,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^2.6.6",
"composer/composer": "^2.7.0",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "^6.22.0",
"ergebnis/phpunit-slow-test-detector": "^2.10.0",
Expand Down
20 changes: 10 additions & 10 deletions composer.lock

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

0 comments on commit 38995f4

Please sign in to comment.