Skip to content

Commit 1e8f097

Browse files
Merge pull request #203 from paragonie/v4.x-round2
Fix CI
2 parents 66137f1 + b2302a3 commit 1e8f097

File tree

2 files changed

+40
-16
lines changed

2 files changed

+40
-16
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
name: CI
22

3-
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
3+
on: [push, pull_request]
84

95
jobs:
10-
phpunit:
6+
old:
117
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
128
runs-on: ${{ matrix.operating-system }}
139
strategy:
1410
matrix:
1511
operating-system: ['ubuntu-latest']
16-
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
17-
12+
php-versions: ['7.2', '7.3']
13+
phpunit-versions: ['latest']
1814
steps:
1915
- name: Checkout
2016
uses: actions/checkout@v4
@@ -24,11 +20,36 @@ jobs:
2420
with:
2521
php-version: ${{ matrix.php-versions }}
2622
extensions: mbstring, intl, sodium
27-
ini-values: error_reporting=-1, display_errors=On
28-
coverage: none
23+
ini-values: post_max_size=256M, max_execution_time=180
24+
tools: psalm
2925

30-
- name: Install Composer dependencies
31-
uses: "ramsey/composer-install@v3"
26+
- name: Install dependencies
27+
run: composer install
3228

3329
- name: PHPUnit tests
3430
run: vendor/bin/phpunit
31+
32+
modern:
33+
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
34+
runs-on: ${{ matrix.operating-system }}
35+
strategy:
36+
matrix:
37+
operating-system: ['ubuntu-latest']
38+
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
39+
steps:
40+
- name: Checkout
41+
uses: actions/checkout@v4
42+
43+
- name: Setup PHP
44+
uses: shivammathur/setup-php@v2
45+
with:
46+
php-version: ${{ matrix.php-versions }}
47+
extensions: mbstring, intl, sodium
48+
ini-values: post_max_size=256M, max_execution_time=180
49+
tools: psalm
50+
51+
- name: Install dependencies
52+
run: composer install
53+
54+
- name: PHPUnit tests
55+
run: vendor/bin/phpunit

.github/workflows/psalm.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
operating-system: ['ubuntu-latest']
16-
php-versions: ['8.1', '8.2', '8.3', '8.4']
17-
16+
php-versions: ['8.1']
1817
steps:
1918
- name: Checkout
2019
uses: actions/checkout@v4
@@ -23,10 +22,14 @@ jobs:
2322
uses: shivammathur/setup-php@v2
2423
with:
2524
php-version: ${{ matrix.php-versions }}
25+
tools: psalm:4
2626
coverage: none
2727

2828
- name: Install Composer dependencies
2929
uses: "ramsey/composer-install@v3"
3030

31-
- name: Psalm static analysis
32-
run: vendor/bin/psalm
31+
- name: Static Analysis
32+
run: psalm
33+
34+
- name: Taint Analysis
35+
run: psalm --taint-analysis

0 commit comments

Comments
 (0)