From 75ae59b28a60d9d2a2dfeec45355a35c9dee2b21 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sat, 27 Aug 2022 18:53:54 +0200 Subject: [PATCH] [TASK] Update to Composer 2.4 (#513) Now that Composer 2.4 has had its first point release, we can safely upgrade from 2.3 to 2.4 in the DDEV configuration and the CI pipeline. --- .ddev/config.yaml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/codecoverage.yml | 2 +- .github/workflows/predefined.yml | 8 ++++---- CHANGELOG.md | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 52bbc1f..8c5f47a 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -18,7 +18,7 @@ hooks: omit_containers: [dba, ddev-ssh-agent] webimage_extra_packages: [parallel] use_dns_when_possible: true -composer_version: "2.3.7" +composer_version: "2.4" web_environment: - typo3DatabaseName=typo3 - typo3DatabaseHost=db diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa5e19f..b1c5061 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Run PHP lint" run: "composer ci:php:lint" strategy: @@ -44,7 +44,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -107,7 +107,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -185,7 +185,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.3 + tools: composer:v2.4 extensions: mysqli coverage: none - name: "Show Composer version" diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml index 0596b97..7cf95ed 100644 --- a/.github/workflows/codecoverage.yml +++ b/.github/workflows/codecoverage.yml @@ -17,7 +17,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.3 + tools: composer:v2.4 extensions: xdebug, mysqli coverage: xdebug - name: "Show Composer version" diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 65d7a41..a097027 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -20,7 +20,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Run PHP lint" run: "composer ci:php:lint" strategy: @@ -103,7 +103,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -160,7 +160,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.3 + tools: composer:v2.4 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -211,7 +211,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.3 + tools: composer:v2.4 extensions: mysqli coverage: none - name: "Show Composer version" diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d2b6dc..7c7a446 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Added ### Changed +- Update to Composer 2.4 (#513) - Change the default indentation for rst files to 4 spaces (#194) ### Deprecated