Skip to content

Commit 2755975

Browse files
Fix CI
1 parent 63328ee commit 2755975

File tree

2 files changed

+42
-19
lines changed

2 files changed

+42
-19
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,43 @@ jobs:
1313
phpunit-versions: ['latest']
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Setup PHP
1919
uses: shivammathur/setup-php@v2
2020
with:
2121
php-version: ${{ matrix.php-versions }}
2222
extensions: mbstring, intl, sodium
2323
ini-values: post_max_size=256M, max_execution_time=180
24-
tools: psalm, phpunit:${{ matrix.phpunit-versions }}
24+
tools: psalm
2525

2626
- name: Install dependencies
2727
run: composer install
2828

2929
- name: PHPUnit tests
30-
uses: php-actions/phpunit@v2
31-
timeout-minutes: 30
32-
with:
33-
memory_limit: 256M
34-
- name: Static Analysis
35-
run: vendor/bin/psalm
30+
run: vendor/bin/phpunit
3631

3732
modern:
3833
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
3934
runs-on: ${{ matrix.operating-system }}
4035
strategy:
4136
matrix:
4237
operating-system: ['ubuntu-latest']
43-
php-versions: ['7.4', '8.0']
44-
phpunit-versions: ['latest']
38+
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
4539
steps:
4640
- name: Checkout
47-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
4842

4943
- name: Setup PHP
5044
uses: shivammathur/setup-php@v2
5145
with:
5246
php-version: ${{ matrix.php-versions }}
5347
extensions: mbstring, intl, sodium
5448
ini-values: post_max_size=256M, max_execution_time=180
55-
tools: psalm, phpunit:${{ matrix.phpunit-versions }}
49+
tools: psalm
5650

5751
- name: Install dependencies
5852
run: composer install
5953

6054
- name: PHPUnit tests
61-
uses: php-actions/phpunit@v2
62-
timeout-minutes: 30
63-
with:
64-
memory_limit: 256M
65-
66-
- name: Static Analysis
67-
run: vendor/bin/psalm
55+
run: vendor/bin/phpunit

.github/workflows/psalm.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Psalm
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
psalm:
11+
name: Psalm on PHP ${{ matrix.php-versions }}
12+
runs-on: ${{ matrix.operating-system }}
13+
strategy:
14+
matrix:
15+
operating-system: ['ubuntu-latest']
16+
php-versions: ['8.1']
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Setup PHP
22+
uses: shivammathur/setup-php@v2
23+
with:
24+
php-version: ${{ matrix.php-versions }}
25+
tools: psalm:4
26+
coverage: none
27+
28+
- name: Install Composer dependencies
29+
uses: "ramsey/composer-install@v3"
30+
31+
- name: Static Analysis
32+
run: psalm
33+
34+
- name: Taint Analysis
35+
run: psalm --taint-analysis

0 commit comments

Comments
 (0)