Skip to content

Commit b447f95

Browse files
committed
Fix CR issues
1 parent 8365611 commit b447f95

File tree

1 file changed

+12
-38
lines changed

1 file changed

+12
-38
lines changed

.github/workflows/tests.yaml

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
symfony-version:
2727
- 3.4.*
2828
- 4.4.*
29-
- 5.2.*
29+
- 5.*
3030
dependencies:
3131
- lowest
3232
- highest
@@ -46,31 +46,18 @@ jobs:
4646
- name: Setup Problem Matchers for PHPUnit
4747
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4848

49-
- name: Determine Composer cache directory
50-
id: composer-cache
51-
run: echo "::set-output name=directory::$(composer config cache-dir)"
52-
53-
- name: Cache Composer dependencies
54-
uses: actions/cache@v2
55-
with:
56-
path: ${{ steps.composer-cache.outputs.directory }}
57-
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
58-
restore-keys: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.dependencies }}-composer-
59-
6049
- name: Remove Symfony Messenger
6150
run: composer remove --dev symfony/messenger --no-update
62-
if: matrix.symfony-version == '3.4.*' || matrix.composer_option == '--prefer-lowest'
51+
if: matrix.symfony-version == '3.4.*'
6352

6453
- name: Install Symfony Flex
6554
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
6655

67-
- name: Install highest dependencies
68-
run: composer update --no-progress --no-interaction --prefer-dist
69-
if: ${{ matrix.dependencies == 'highest' }}
70-
71-
- name: Install lowest dependencies
72-
run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest
73-
if: ${{ matrix.dependencies == 'lowest' }}
56+
- name: Install dependencies
57+
uses: ramsey/composer-install@v1
58+
with:
59+
dependency-versions: ${{ matrix.dependencies }}
60+
composer-options: --prefer-dist
7461

7562
- name: Run tests
7663
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
@@ -106,27 +93,14 @@ jobs:
10693
- name: Setup Problem Matchers for PHPUnit
10794
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
10895

109-
- name: Determine Composer cache directory
110-
id: composer-cache
111-
run: echo "::set-output name=directory::$(composer config cache-dir)"
112-
113-
- name: Cache Composer dependencies
114-
uses: actions/cache@v2
115-
with:
116-
path: ${{ steps.composer-cache.outputs.directory }}
117-
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
118-
restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}-
119-
12096
- name: Remove optional packages
12197
run: composer remove doctrine/dbal doctrine/doctrine-bundle symfony/messenger symfony/twig-bundle symfony/cache --dev --no-update
12298

123-
- name: Install highest dependencies
124-
run: composer update --no-progress --no-interaction --prefer-dist
125-
if: ${{ matrix.dependencies == 'highest' }}
126-
127-
- name: Install lowest dependencies
128-
run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest
129-
if: ${{ matrix.dependencies == 'lowest' }}
99+
- name: Install dependencies
100+
uses: ramsey/composer-install@v1
101+
with:
102+
dependency-versions: ${{ matrix.dependencies }}
103+
composer-options: --prefer-dist
130104

131105
- name: Run tests
132106
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml

0 commit comments

Comments
 (0)