Skip to content

Commit b23ae69

Browse files
committed
Fix CR issues
1 parent b08a852 commit b23ae69

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
@@ -25,7 +25,7 @@ jobs:
2525
symfony-version:
2626
- 3.4.*
2727
- 4.4.*
28-
- 5.2.*
28+
- 5.0.*
2929
dependencies:
3030
- lowest
3131
- highest
@@ -45,31 +45,18 @@ jobs:
4545
- name: Setup Problem Matchers for PHPUnit
4646
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4747

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)