Skip to content

Commit

Permalink
Fix: Drop support for composer/composer:^1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Oct 31, 2020
1 parent ea111dc commit 9bfa234
Show file tree
Hide file tree
Showing 6 changed files with 207 additions and 84 deletions.
31 changes: 2 additions & 29 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
- "main"

env:
COMPOSER_VERSION: "1.10.17"
COMPOSER_VERSION: "2.0.4"
ERGEBNIS_BOT_NAME: "ergebnis-bot"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"
Expand Down Expand Up @@ -201,29 +201,13 @@ jobs:
- "7.2"
- "7.3"
- "7.4"

composer-version:
- "1"
- "2"
- "8.0"

dependencies:
- "lowest"
- "locked"
- "highest"

include:
- php-version: "8.0"
composer-version: "2"
dependencies: "lowest"

- php-version: "8.0"
composer-version: "2"
dependencies: "locked"

- php-version: "8.0"
composer-version: "2"
dependencies: "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2.3.3"
Expand All @@ -239,17 +223,6 @@ jobs:
- name: "Set up problem matchers for phpunit/phpunit"
run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""

- name: "Install composer:^1"
if: "matrix.composer-version == '1'"
run: "composer self-update ${{ env.COMPOSER_VERSION }}"

- name: "Install composer:^2"
if: "matrix.composer-version == '2'"
run: "composer self-update --snapshot"

- name: "Show composer version"
run: "composer --version"

- name: "Determine composer cache directory"
uses: "./.github/actions/composer/composer/determine-cache-directory"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
- "**"

env:
COMPOSER_VERSION: "1.10.17"
COMPOSER_VERSION: "2.0.4"
PHP_EXTENSIONS: "mbstring"
PHP_INI_VALUES: "memory_limit=-1, phar.readonly=0"

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

## Unreleased

For a full diff see [`2.9.0...main`][2.9.0...main].
For a full diff see [`2.9.1...main`][2.9.1...main].

## [`2.9.1`][2.9.1]

For a full diff see [`2.9.0...2.9.1`][2.9.0...2.9.1].

### Fixed

* Required at least `composer/composer:^1.10.17` and used `composer/composer:1.10.17` for `composer-normalize.phar` ([#596]), by [@localheinz]
* Dropped support for `composer/composer:^1.0.0` ([#597]), by [@localheinz]

## [`2.9.0`][2.9.0]

Expand Down Expand Up @@ -469,6 +474,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.8.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.1
[2.8.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.8.2
[2.9.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.9.0
[2.9.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.9.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 @@ -513,7 +519,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.8.0...2.8.1]: https://github.com/ergebnis/composer-normalize/compare/2.8.0...2.8.1
[2.8.1...2.8.2]: https://github.com/ergebnis/composer-normalize/compare/2.8.1...2.8.2
[2.8.2...2.9.0]: https://github.com/ergebnis/composer-normalize/compare/2.8.2...2.9.0
[2.9.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.9.0...main
[2.9.0...2.9.1]: https://github.com/ergebnis/composer-normalize/compare/2.9.0...2.9.1
[2.9.1...main]: https://github.com/ergebnis/composer-normalize/compare/2.9.1...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -580,6 +587,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#572]: https://github.com/ergebnis/composer-normalize/pull/572
[#582]: https://github.com/ergebnis/composer-normalize/pull/582
[#596]: https://github.com/ergebnis/composer-normalize/pull/596
[#597]: https://github.com/ergebnis/composer-normalize/pull/597

[@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:=1.10.17
COMPOSER_VERSION:=2.0.4

.PHONY: it
it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
],
"require": {
"php": "^7.2 || ^8.0",
"composer-plugin-api": "^1.1.0 || ^2.0.0",
"composer-plugin-api": "^2.0.0",
"ergebnis/json-normalizer": "~0.13.1",
"ergebnis/json-printer": "^3.1.1",
"justinrainbow/json-schema": "^5.2.10",
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^1.10.17 || ^2.0.0",
"composer/composer": "^2.0.0",
"composer/package-versions-deprecated": "^1.11.99",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.5.1",
Expand Down
Loading

0 comments on commit 9bfa234

Please sign in to comment.