Skip to content

Commit

Permalink
[TASK] Always use the latest Composer V2
Browse files Browse the repository at this point in the history
This saves us changes to the configuration files each time a new
Composer major version is released.
  • Loading branch information
oliverklee committed Nov 17, 2023
1 parent 1cd6ec4 commit e4cabd7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/predefined.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit e4cabd7

Please sign in to comment.