Skip to content

Commit 621c1e9

Browse files
committed
ci & pie
1 parent d514428 commit 621c1e9

File tree

3 files changed

+68
-32
lines changed

3 files changed

+68
-32
lines changed

.github/workflows/ci.yml

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
enable_debug: "yes"
1515
enable_maintainer_zts: "yes"
1616
enable_session: "yes"
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v2
2020
with:
@@ -42,7 +42,7 @@ jobs:
4242
enable_debug: "yes"
4343
enable_maintainer_zts: "yes"
4444
enable_session: "yes"
45-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-24.04
4646
steps:
4747
- uses: actions/checkout@v2
4848
with:
@@ -70,7 +70,7 @@ jobs:
7070
enable_debug: "yes"
7171
enable_maintainer_zts: "yes"
7272
enable_session: "yes"
73-
runs-on: ubuntu-20.04
73+
runs-on: ubuntu-24.04
7474
steps:
7575
- uses: actions/checkout@v2
7676
with:
@@ -98,7 +98,35 @@ jobs:
9898
enable_debug: "yes"
9999
enable_maintainer_zts: "yes"
100100
enable_session: "yes"
101-
runs-on: ubuntu-20.04
101+
runs-on: ubuntu-24.04
102+
steps:
103+
- uses: actions/checkout@v2
104+
with:
105+
submodules: true
106+
- name: Install
107+
run: |
108+
sudo apt-get install -y \
109+
php-cli \
110+
php-pear \
111+
re2c
112+
- name: Prepare
113+
run: |
114+
make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
115+
- name: Build
116+
run: |
117+
make -f scripts/ci/Makefile ext PECL=msgpack
118+
- name: Test
119+
run: |
120+
make -f scripts/ci/Makefile test
121+
122+
old-matrix-4:
123+
name: php-8.3-debug-nozts
124+
env:
125+
PHP: "8.3"
126+
enable_debug: "yes"
127+
enable_maintainer_zts: "yes"
128+
enable_session: "yes"
129+
runs-on: ubuntu-24.04
102130
steps:
103131
- uses: actions/checkout@v2
104132
with:
@@ -127,7 +155,7 @@ jobs:
127155
enable_debug: "yes"
128156
enable_zts: "yes"
129157
enable_session: "yes"
130-
runs-on: ubuntu-20.04
158+
runs-on: ubuntu-24.04
131159
steps:
132160
- uses: actions/checkout@v2
133161
with:
@@ -149,11 +177,11 @@ jobs:
149177
make -f scripts/ci/Makefile test
150178
151179
cur-none-0:
152-
name: php-8.3-nodebug-nozts
180+
name: php-8.4-nodebug-nozts
153181
env:
154-
PHP: "8.3"
182+
PHP: "8.4"
155183
enable_session: "no"
156-
runs-on: ubuntu-20.04
184+
runs-on: ubuntu-24.04
157185
steps:
158186
- uses: actions/checkout@v2
159187
with:
@@ -175,13 +203,13 @@ jobs:
175203
make -f scripts/ci/Makefile test
176204
177205
cur-dbg-zts-0:
178-
name: php-8.3-debug-zts
206+
name: php-8.4-debug-zts
179207
env:
180-
PHP: "8.3"
208+
PHP: "8.4"
181209
enable_debug: "yes"
182210
enable_zts: "yes"
183211
enable_session: "yes"
184-
runs-on: ubuntu-20.04
212+
runs-on: ubuntu-24.04
185213
steps:
186214
- uses: actions/checkout@v2
187215
with:
@@ -203,13 +231,13 @@ jobs:
203231
make -f scripts/ci/Makefile test
204232
205233
cur-dbg-zts-1:
206-
name: php-8.3-nodebug-zts
234+
name: php-8.4-nodebug-zts
207235
env:
208-
PHP: "8.3"
236+
PHP: "8.4"
209237
enable_debug: "no"
210238
enable_zts: "yes"
211239
enable_session: "yes"
212-
runs-on: ubuntu-20.04
240+
runs-on: ubuntu-24.04
213241
steps:
214242
- uses: actions/checkout@v2
215243
with:
@@ -231,13 +259,13 @@ jobs:
231259
make -f scripts/ci/Makefile test
232260
233261
cur-dbg-zts-2:
234-
name: php-8.3-debug-nozts
262+
name: php-8.4-debug-nozts
235263
env:
236-
PHP: "8.3"
264+
PHP: "8.4"
237265
enable_debug: "yes"
238266
enable_zts: "no"
239267
enable_session: "yes"
240-
runs-on: ubuntu-20.04
268+
runs-on: ubuntu-24.04
241269
steps:
242270
- uses: actions/checkout@v2
243271
with:
@@ -259,13 +287,13 @@ jobs:
259287
make -f scripts/ci/Makefile test
260288
261289
cur-dbg-zts-3:
262-
name: php-8.3-nodebug-nozts
290+
name: php-8.4-nodebug-nozts
263291
env:
264-
PHP: "8.3"
292+
PHP: "8.4"
265293
enable_debug: "no"
266294
enable_zts: "no"
267295
enable_session: "yes"
268-
runs-on: ubuntu-20.04
296+
runs-on: ubuntu-24.04
269297
steps:
270298
- uses: actions/checkout@v2
271299
with:
@@ -287,13 +315,13 @@ jobs:
287315
make -f scripts/ci/Makefile test
288316
289317
cur-cov-0:
290-
name: php-8.3-nodebug-nozts
318+
name: php-8.4-nodebug-nozts
291319
env:
292320
CFLAGS: "-O0 -g --coverage"
293321
CXXFLAGS: "-O0 -g --coverage"
294-
PHP: "8.3"
322+
PHP: "8.4"
295323
enable_session: "yes"
296-
runs-on: ubuntu-20.04
324+
runs-on: ubuntu-24.04
297325
steps:
298326
- uses: actions/checkout@v2
299327
with:
@@ -315,7 +343,5 @@ jobs:
315343
make -f scripts/ci/Makefile test
316344
- name: Coverage
317345
if: success()
318-
run: |
319-
cd .libs
320-
bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
346+
uses: codecov/codecov-action@v5
321347

composer.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "msgpack/msgpack-php",
3+
"type": "php-ext",
4+
"license": "BSD-3-Clause",
5+
"description": "MessagePack serialization API",
6+
"require": {
7+
"php": ">= 7.0.0"
8+
},
9+
"php-ext": {
10+
"extension-name": "msgpack"
11+
}
12+
}

scripts/gen_github_workflow_ci.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ function jobname(string $id, array $env) : string {
2424
return sprintf("php-%s-%s-%s", $env["PHP"], yesno($env, "debug"), yesno($env, "zts"));
2525
}
2626
$gen = include __DIR__ . "/ci/gen-matrix.php";
27-
$cur = "8.3";
27+
$cur = "8.4";
2828
$job = $gen->github([
2929
"old-matrix" => [
3030
// most useful for all additional versions except current
31-
"PHP" => ["7.4", "8.0", "8.1", "8.2"],
31+
"PHP" => ["7.4", "8.0", "8.1", "8.2", "8.3"],
3232
"enable_debug" => "yes",
3333
"enable_maintainer_zts" => "yes",
3434
"enable_session" => "yes",
@@ -70,7 +70,7 @@ function jobname(string $id, array $env) : string {
7070
printf(" %s: \"%s\"\n", $key, $val);
7171
}
7272
?>
73-
runs-on: ubuntu-20.04
73+
runs-on: ubuntu-24.04
7474
steps:
7575
- uses: actions/checkout@v2
7676
with:
@@ -93,9 +93,7 @@ function jobname(string $id, array $env) : string {
9393
<?php if (isset($env["CFLAGS"]) && strpos($env["CFLAGS"], "--coverage") != false) : ?>
9494
- name: Coverage
9595
if: success()
96-
run: |
97-
cd .libs
98-
bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
96+
uses: codecov/codecov-action@v5
9997
<?php endif; ?>
10098

10199
<?php

0 commit comments

Comments
 (0)