Skip to content

Commit cf456ee

Browse files
authored
Merge pull request #12 from acsiomatic/ramsey-composer-install
uses ramsey/composer-install in the CI
2 parents 00c9af2 + c62b349 commit cf456ee

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

.github/workflows/static-analysis.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,8 @@ jobs:
2626
php-version: 7.4
2727
tools: phpstan, cs2pr
2828

29-
- name: Get Composer cache directory
30-
id: composercache
31-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
32-
33-
- name: Cache Composer dependencies
34-
uses: actions/cache@v2
35-
with:
36-
path: ${{ steps.composercache.outputs.dir }}
37-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
38-
restore-keys: ${{ runner.os }}-composer-
39-
4029
- name: Install Composer dependencies
41-
run: composer install --no-progress --prefer-dist --optimize-autoloader
30+
uses: ramsey/composer-install@v1
4231

4332
- name: Cache PHPStan
4433
uses: actions/cache@v2

.github/workflows/tests.yaml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,13 @@ jobs:
4949
php-version: ${{ matrix.php-version }}
5050
coverage: ${{ matrix.coverage && 'pcov' || 'none' }}
5151

52-
- name: Get Composer cache directory
53-
id: composercache
54-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
55-
56-
- name: Cache Composer dependencies
57-
uses: actions/cache@v2
58-
with:
59-
path: ${{ steps.composercache.outputs.dir }}
60-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
61-
restore-keys: ${{ runner.os }}-composer-
62-
6352
- name: Install Composer dependencies
64-
run: |
65-
composer update --no-progress --prefer-dist --optimize-autoloader \
66-
--with matomo/device-detector:${{ matrix.device-detector-version }} \
67-
--with symfony/framework-bundle:${{ matrix.symfony-version }}
53+
uses: ramsey/composer-install@v1
54+
with:
55+
dependency-versions: highest
56+
composer-options: >
57+
--with matomo/device-detector:${{ matrix.device-detector-version }}
58+
--with symfony/framework-bundle:${{ matrix.symfony-version }}
6859
6960
- name: Run PHPUnit
7061
run: vendor/bin/phpunit --testdox ${{ matrix.coverage && '--coverage-clover coverage.xml' || '--no-coverage' }}

0 commit comments

Comments
 (0)