Skip to content

Commit

Permalink
Update GitHub Actions to use Composer v1 for the moment (#535)
Browse files Browse the repository at this point in the history
Until such a time that `wikimedia/composer-merge-plugin` supports Composer 2.

Refs: octobercms/october#5330 (comment)
  • Loading branch information
Ben Thomson authored Oct 25, 2020
1 parent c6d3bdb commit 72ea50d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/code-quality-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Code Quality
on:
push:
branches:
- master
- 1.0
- 1.1
- develop

jobs:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Tests
on:
push:
branches:
- master
- 1.0
- 1.1
- develop
pull_request:

Expand Down Expand Up @@ -43,7 +44,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.phpVersion }}
tools: composer
tools: composer:v1
extensions: ${{ env.extensions }}

- name: Setup dependency cache
Expand All @@ -65,4 +66,4 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run tests
run: ./vendor/bin/phpunit ./tests
run: ./vendor/bin/phpunit ./tests

0 comments on commit 72ea50d

Please sign in to comment.