From 6945f9bd18c9566db67b8ae470c160c88b3d1012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 30 Dec 2020 15:37:17 +0100 Subject: [PATCH] Enhancement: Bring back support for composer/composer:^1 --- .github/settings.yml | 36 +++++++++++++++++++++----------- .github/workflows/integrate.yaml | 31 +++++++++++++++++++++++++++ .github/workflows/release.yaml | 3 +++ CHANGELOG.md | 15 +++++++++++-- composer.json | 4 ++-- composer.lock | 4 ++-- 6 files changed, 75 insertions(+), 18 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index c3d22397..73646c45 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -20,18 +20,30 @@ branches: - "Dependency Analysis (7.4, locked)" - "Static Code Analysis (7.4, locked)" - "Static Code Analysis (7.4, locked)" - - "Tests (7.2, highest)" - - "Tests (7.2, locked)" - - "Tests (7.2, lowest)" - - "Tests (7.3, highest)" - - "Tests (7.3, locked)" - - "Tests (7.3, lowest)" - - "Tests (7.4, highest)" - - "Tests (7.4, locked)" - - "Tests (7.4, lowest)" - - "Tests (8.0, highest)" - - "Tests (8.0, locked)" - - "Tests (8.0, lowest)" + - "Tests (7.2, 1, highest)" + - "Tests (7.2, 1, locked)" + - "Tests (7.2, 1, lowest)" + - "Tests (7.2, 2, highest)" + - "Tests (7.2, 2, locked)" + - "Tests (7.2, 2, lowest)" + - "Tests (7.3, 1, highest)" + - "Tests (7.3, 1, locked)" + - "Tests (7.3, 1, lowest)" + - "Tests (7.3, 2, highest)" + - "Tests (7.3, 2, locked)" + - "Tests (7.3, 2, lowest)" + - "Tests (7.4, 1, highest)" + - "Tests (7.4, 1, locked)" + - "Tests (7.4, 1, lowest)" + - "Tests (7.4, 2, highest)" + - "Tests (7.4, 2, locked)" + - "Tests (7.4, 2, lowest)" + - "Tests (8.0, 1, highest)" + - "Tests (8.0, 1, locked)" + - "Tests (8.0, 1, lowest)" + - "Tests (8.0, 2, highest)" + - "Tests (8.0, 2, locked)" + - "Tests (8.0, 2, lowest)" strict: false restrictions: diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index bddca6ce..bb1d5e45 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -202,11 +202,28 @@ jobs: - "7.4" - "8.0" + composer-version: + - "1" + - "2" + 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.4" @@ -222,6 +239,17 @@ 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" @@ -340,6 +368,9 @@ jobs: with: dependencies: "${{ matrix.dependencies }}" + - name: "Remove composer/composer" + run: "composer remove composer/composer --no-interaction --no-progress" + - name: "Require composer/composer" run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0aee1da8..ffa3d120 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -59,6 +59,9 @@ jobs: with: dependencies: "${{ matrix.dependencies }}" + - name: "Remove composer/composer" + run: "composer remove composer/composer --no-interaction --no-progress" + - name: "Require composer/composer" run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a52e040..105a287c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.12.2...main`][2.12.2...main]. +For a full diff see [`2.13.0...main`][2.13.0...main]. + +## [`2.13.0`][2.13.0] + +For a full diff see [`2.12.2...2.13.0`][2.12.2...2.13.0]. + +### Changed + +* Brought back support for `composer/composer:^1.0.0` ([#644]), by [@localheinz] ## [`2.12.2`][2.12.2] @@ -528,6 +536,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.12.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.0 [2.12.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.1 [2.12.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.2 +[2.13.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.0 [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 @@ -578,7 +587,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [2.11.0...2.12.0]: https://github.com/ergebnis/composer-normalize/compare/2.11.0...2.12.0 [2.12.0...2.12.1]: https://github.com/ergebnis/composer-normalize/compare/2.12.0...2.12.1 [2.12.1...2.12.2]: https://github.com/ergebnis/composer-normalize/compare/2.12.1...2.12.2 -[2.12.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...main +[2.12.2...2.13.0]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...2.13.0 +[2.13.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.13.0...main [#1]: https://github.com/ergebnis/composer-normalize/pull/1 [#2]: https://github.com/ergebnis/composer-normalize/pull/2 @@ -652,6 +662,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#640]: https://github.com/ergebnis/composer-normalize/pull/640 [#641]: https://github.com/ergebnis/composer-normalize/pull/641 [#643]: https://github.com/ergebnis/composer-normalize/pull/643 +[#644]: https://github.com/ergebnis/composer-normalize/pull/644 [#646]: https://github.com/ergebnis/composer-normalize/pull/646 [@core23]: https://github.com/core23 diff --git a/composer.json b/composer.json index 3278feeb..2b6f8ff9 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ ], "require": { "php": "^7.2 || ^8.0", - "composer-plugin-api": "^2.0.0", + "composer-plugin-api": "^1.1.0 || ^2.0.0", "ergebnis/json-normalizer": "^1.0.1", "ergebnis/json-printer": "^3.1.1", "justinrainbow/json-schema": "^5.2.10", "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^2.0.8", + "composer/composer": "^1.10.19 || ^2.0.8", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.10.0", "ergebnis/phpstan-rules": "~0.15.3", diff --git a/composer.lock b/composer.lock index e22334c5..00c5005e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "36c09bf747bfac06c436e6a8234ff46f", + "content-hash": "5375ae170144889749a1f1ab261fe051", "packages": [ { "name": "ergebnis/json-normalizer", @@ -5904,7 +5904,7 @@ "prefer-lowest": false, "platform": { "php": "^7.2 || ^8.0", - "composer-plugin-api": "^2.0.0" + "composer-plugin-api": "^1.1.0 || ^2.0.0" }, "platform-dev": [], "platform-overrides": {