Skip to content

Commit

Permalink
Merge pull request #942 from ergebnis/fix/composer
Browse files Browse the repository at this point in the history
Fix: Update `composer/composer`
  • Loading branch information
localheinz authored Jul 5, 2022
2 parents 8fa1ffd + 1a1bffe commit ec75a2b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 13 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.8"
COMPOSER_VERSION: "2.3.9"

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.8"
COMPOSER_VERSION: "2.3.9"
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.28.2...main`][2.28.2...main].
For a full diff see [`2.28.3...main`][2.28.3...main].

## [`2.28.3`][2.28.3]

For a full diff see [`2.28.2...2.28.3`][2.28.2...2.28.3].

### Fixed

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

## [`2.28.2`][2.28.2]

Expand Down Expand Up @@ -781,6 +789,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.28.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.0
[2.28.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.1
[2.28.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.2
[2.28.3]: https://github.com/ergebnis/composer-normalize/releases/tag/2.28.3

[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 @@ -857,7 +866,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.27.0...2.28.0]: https://github.com/ergebnis/composer-normalize/compare/2.27.0...2.28.0
[2.28.0...2.28.1]: https://github.com/ergebnis/composer-normalize/compare/2.28.0...2.28.1
[2.28.1...2.28.2]: https://github.com/ergebnis/composer-normalize/compare/2.28.1...2.28.2
[2.28.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.28.2...main
[2.28.2...2.28.4]: https://github.com/ergebnis/composer-normalize/compare/2.28.2...2.28.3
[2.28.3...main]: https://github.com/ergebnis/composer-normalize/compare/2.28.3...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -967,6 +977,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#933]: https://github.com/ergebnis/composer-normalize/pull/933
[#938]: https://github.com/ergebnis/composer-normalize/pull/938
[#941]: https://github.com/ergebnis/composer-normalize/pull/941
[#942]: https://github.com/ergebnis/composer-normalize/pull/942

[@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.8
COMPOSER_VERSION:=2.3.9

.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.8",
"composer/composer": "^2.3.9",
"ergebnis/license": "^1.2.0",
"ergebnis/php-cs-fixer-config": "^4.4.0",
"fakerphp/faker": "^1.19.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

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

0 comments on commit ec75a2b

Please sign in to comment.