From 2a763a239820535860c8490f10d1553f6feb7872 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sat, 18 Nov 2023 04:38:07 +0100 Subject: [PATCH] [TASK] Always use the latest Composer V2 (#994) This saves us changes to the configuration files each time a new Composer major version is released. --- .ddev/config.yaml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/predefined.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 473f8aa..2718ff8 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -19,7 +19,7 @@ hooks: omit_containers: [dba, ddev-ssh-agent] webimage_extra_packages: [parallel] use_dns_when_possible: true -composer_version: "2.4" +composer_version: "2" web_environment: - typo3DatabaseName=typo3 - typo3DatabaseHost=db diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36820b2..08eaad0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Show the Composer configuration" run: "composer config --global --list" - name: "Run PHP lint" @@ -48,7 +48,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Show Composer version" run: "composer --version" - name: "Show the Composer configuration" @@ -113,7 +113,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Show Composer version" run: "composer --version" - name: "Show the Composer configuration" @@ -210,7 +210,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.6 + tools: composer:v2 extensions: mysqli coverage: none - name: "Show Composer version" diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 0ae1f4c..bbb2171 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -22,7 +22,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Run PHP lint" run: "composer ci:php:lint" strategy: @@ -97,7 +97,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -154,7 +154,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.6 + tools: composer:v2 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -237,7 +237,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.6 + tools: composer:v2 extensions: mysqli coverage: none - name: "Show Composer version"