Skip to content

Commit 27c1ece

Browse files
committed
fix CI
1 parent 94d57d9 commit 27c1ece

File tree

1 file changed

+10
-40
lines changed

1 file changed

+10
-40
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['7.2', '7.4', '8.0']
18-
prefer-lowest: ['']
17+
php-version: ['7.2', '7.4']
18+
dependencies: [highest]
1919
include:
2020
- php-version: '7.2'
21-
prefer-lowest: 'prefer-lowest'
21+
dependencies: 'lowest'
22+
- php-version: '8.0'
23+
composer-options: "--ignore-platform-reqs"
2224

2325
steps:
2426
- uses: actions/checkout@v2
@@ -30,29 +32,11 @@ jobs:
3032
extensions: mbstring, intl
3133
coverage: pcov
3234

33-
- name: Get composer cache directory
34-
id: composer-cache
35-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
36-
37-
- name: Get date part for cache key
38-
id: key-date
39-
run: echo "::set-output name=date::$(date +'%Y-%m')"
40-
41-
- name: Cache composer dependencies
42-
uses: actions/cache@v1
35+
- name: Composer install
36+
uses: ramsey/composer-install@v3
4337
with:
44-
path: ${{ steps.composer-cache.outputs.dir }}
45-
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
46-
47-
- name: Composer Install
48-
run: |
49-
if [[ ${{ matrix.php-version }} == '8.0' ]]; then
50-
composer install --ignore-platform-reqs
51-
elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
52-
composer update --prefer-lowest --prefer-stable
53-
else
54-
composer install
55-
fi
38+
dependency-versions: ${{ matrix.dependencies }}
39+
composer-options: "${{ matrix.composer-options }}"
5640

5741
- name: Setup problem matchers for PHPUnit
5842
if: matrix.php-version == '7.4'
@@ -82,22 +66,8 @@ jobs:
8266
tools: cs2pr
8367
coverage: none
8468

85-
- name: Get composer cache directory
86-
id: composer-cache
87-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
88-
89-
- name: Get date part for cache key
90-
id: key-date
91-
run: echo "::set-output name=date::$(date +'%Y-%m')"
92-
93-
- name: Cache composer dependencies
94-
uses: actions/cache@v1
95-
with:
96-
path: ${{ steps.composer-cache.outputs.dir }}
97-
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
98-
9969
- name: Composer install
100-
run: composer install
70+
uses: ramsey/composer-install@v3
10171

10272
- name: Run PHP CodeSniffer
10373
run: vendor/bin/phpcs --report=checkstyle CakePHP/ | cs2pr

0 commit comments

Comments
 (0)