Skip to content

Commit f50ab28

Browse files
authored
Merge pull request PHP-DI#884 from takaram/patch-1
Improve CI settings
2 parents 253a05f + b452371 commit f50ab28

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
dependency-version: '--prefer-lowest'
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
2727
with:
@@ -32,17 +32,13 @@ jobs:
3232
extensions: apcu
3333
ini-values: apc.enable_cli=1
3434
- name: Cache Composer dependencies
35-
uses: actions/cache@v2
35+
uses: actions/cache@v4
3636
with:
3737
path: ~/.composer/cache
3838
key: php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}
3939
restore-keys: php-${{ matrix.php }}-composer-locked-
4040
- name: Install PHP dependencies
41-
if: matrix.php != '8.1'
4241
run: composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
43-
- name: 'Install PHP dependencies on PHP 8.1 (TODO: remove that)'
44-
if: matrix.php == '8.1'
45-
run: composer update --ignore-platform-reqs ${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress --no-suggest
4642
- name: PHPUnit
4743
run: vendor/bin/phpunit
4844

@@ -51,15 +47,15 @@ jobs:
5147
runs-on: ubuntu-latest
5248
steps:
5349
- name: Checkout
54-
uses: actions/checkout@v2
50+
uses: actions/checkout@v4
5551
- name: Setup PHP
5652
uses: shivammathur/setup-php@v2
5753
with:
5854
php-version: 8.0
5955
tools: composer:v2, cs2pr
6056
coverage: none
6157
- name: Cache Composer dependencies
62-
uses: actions/cache@v2
58+
uses: actions/cache@v4
6359
with:
6460
path: ~/.composer/cache
6561
key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -73,20 +69,20 @@ jobs:
7369
runs-on: ubuntu-latest
7470
steps:
7571
- name: Checkout
76-
uses: actions/checkout@v2
72+
uses: actions/checkout@v4
7773
- name: Setup PHP
7874
uses: shivammathur/setup-php@v2
7975
with:
8076
php-version: 8.0
81-
tools: composer:v2, cs2pr
77+
tools: composer:v2
8278
coverage: none
8379
- name: Cache Composer dependencies
84-
uses: actions/cache@v2
80+
uses: actions/cache@v4
8581
with:
8682
path: ~/.composer/cache
8783
key: php-composer-locked-${{ hashFiles('composer.lock') }}
8884
restore-keys: php-composer-locked-
8985
- name: Install PHP dependencies
9086
run: composer install --no-interaction --no-progress --no-suggest
9187
- name: Psalm
92-
run: vendor/bin/psalm --output-format=checkstyle | cs2pr
88+
run: vendor/bin/psalm --output-format=github

0 commit comments

Comments
 (0)