Skip to content

Commit d1e6d59

Browse files
authored
Merge pull request #26 from kiddivouchers/update-ci
Update CI configuration
2 parents bc9d106 + aa91bb2 commit d1e6d59

2 files changed

Lines changed: 24 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
build:
1111
name: PHP ${{ matrix.php-version }} (ZTS ${{ matrix.php-zts }})
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
timeout-minutes: 30
1414
strategy:
1515
fail-fast: false
@@ -24,9 +24,15 @@ jobs:
2424
- '8.0'
2525
- '8.1'
2626
- '8.2'
27+
- '8.3'
2728
php-zts:
2829
- nts
29-
# @todo Add ts when setup-php supports ZTS on Ubuntu
30+
- ts
31+
exclude:
32+
- php-version: '5.6'
33+
php-zts: 'ts'
34+
- php-version: '8.3'
35+
php-zts: 'ts'
3036
steps:
3137
- name: Setup PHP
3238
uses: shivammathur/setup-php@v2
@@ -35,6 +41,9 @@ jobs:
3541
coverage: none
3642
env:
3743
phpts: ${{ matrix.php-zts }}
44+
- name: PHP version
45+
run: |
46+
php --version
3847
- name: Set PHP_API
3948
run: |
4049
echo "PHP_API=$(php-config --phpapi)" >> $GITHUB_ENV
@@ -46,15 +55,23 @@ jobs:
4655
./configure
4756
make
4857
make test REPORT_EXIT_STATUS=1 NO_INTERACTION=1 TESTS="--show-all"
49-
- name: Save artifact
58+
- name: Save artifact (NTS)
5059
uses: actions/upload-artifact@v3
60+
if: matrix.php-zts == 'nts'
5161
with:
5262
name: timecop_${{ env.PHP_API }}.so
5363
path: modules/timecop.so
5464
if-no-files-found: error
65+
- name: Save artifact (TS)
66+
uses: actions/upload-artifact@v3
67+
if: matrix.php-zts == 'ts'
68+
with:
69+
name: timecop_${{ env.PHP_API }}_zts.so
70+
path: modules/timecop.so
71+
if-no-files-found: error
5572
package:
5673
name: Package for download
57-
runs-on: ubuntu-20.04
74+
runs-on: ubuntu-22.04
5875
timeout-minutes: 10
5976
needs: build
6077
steps:

.github/workflows/valgrind.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
php-version:
1616
- '5.6.40'
1717
- '7.4.19'
18-
- '8.1.13'
19-
- '8.2.0'
18+
- '8.1.25'
19+
- '8.2.12'
2020
os:
21-
- 'ubuntu-20.04'
21+
- 'ubuntu-22.04'
2222
steps:
2323
- name: Install valgrind
2424
run: |

0 commit comments

Comments
 (0)