Skip to content

Commit

Permalink
Merge pull request #941 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 3, 2022
2 parents 4152d7e + 0dada1b commit 8fa1ffd
Show file tree
Hide file tree
Showing 6 changed files with 30 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.5"
COMPOSER_VERSION: "2.3.8"

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.5"
COMPOSER_VERSION: "2.3.8"
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.1...main`][2.28.1...main].
For a full diff see [`2.28.2...main`][2.28.2...main].

## [`2.28.2`][2.28.2]

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

### Fixed

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

## [`2.28.1`][2.28.1]

Expand Down Expand Up @@ -772,6 +780,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.27.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.27.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

[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 @@ -847,7 +856,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.26.0...2.27.0]: https://github.com/ergebnis/composer-normalize/compare/2.26.0...2.27.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...main]: https://github.com/ergebnis/composer-normalize/compare/2.28.1...main
[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

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -956,6 +966,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#930]: https://github.com/ergebnis/composer-normalize/pull/930
[#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

[@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.5
COMPOSER_VERSION:=2.3.8

.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.5",
"composer/composer": "^2.3.8",
"ergebnis/license": "^1.2.0",
"ergebnis/php-cs-fixer-config": "^4.4.0",
"fakerphp/faker": "^1.19.0",
Expand Down
21 changes: 13 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 8fa1ffd

Please sign in to comment.