Skip to content

Commit

Permalink
Merge pull request #915 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz authored Mar 30, 2022
2 parents 089bd72 + ac90c18 commit f8dcad3
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 14 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.0"
COMPOSER_VERSION: "2.3.1"

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.0"
COMPOSER_VERSION: "2.3.1"
GPG_KEYS: ".build/phar/keys.asc"
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"

Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`2.25.0...main`][2.25.0...main].
For a full diff see [`2.25.1...main`][2.25.1...main].

## [`2.25.1`][2.25.1]

For a full diff see [`2.25.0...2.25.1`][2.25.0....2.25.1].

### Changed

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

## [`2.25.0`][2.25.0]

Expand Down Expand Up @@ -713,6 +721,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.24.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.0
[2.24.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.24.1
[2.25.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.0
[2.25.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.25.1

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
Expand Down Expand Up @@ -781,7 +790,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.23.0...2.23.1]: https://github.com/ergebnis/composer-normalize/compare/2.23.0...2.23.1
[2.23.1...2.24.0]: https://github.com/ergebnis/composer-normalize/compare/2.23.1...2.24.0
[2.24.0...2.24.1]: https://github.com/ergebnis/composer-normalize/compare/2.24.0...2.24.1
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.10
[2.24.1...2.25.0]: https://github.com/ergebnis/composer-normalize/compare/2.24.1...2.25.0
[2.25.0...2.25.1]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...2.25.1
[2.25.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.25.0...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
Expand Down Expand Up @@ -882,6 +892,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#905]: https://github.com/ergebnis/composer-normalize/pull/905
[#912]: https://github.com/ergebnis/composer-normalize/pull/912
[#913]: https://github.com/ergebnis/composer-normalize/pull/913
[#915]: https://github.com/ergebnis/composer-normalize/pull/915

[@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.0
COMPOSER_VERSION:=2.3.1

.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.0",
"composer/composer": "^2.3.1",
"ergebnis/license": "^1.2.0",
"ergebnis/php-cs-fixer-config": "^4.4.0",
"fakerphp/faker": "^1.19.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 f8dcad3

Please sign in to comment.