Skip to content

Commit 88e8ed0

Browse files
committed
tools: test building with --experimental-quic
1 parent c1277d6 commit 88e8ed0

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/test-shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
--arg ccache '(import <nixpkgs> {}).sccache' \
199199
--arg devTools '[]' \
200200
--arg benchmarkTools '[]' \
201-
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
201+
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withQuic true --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
202202
--run '
203203
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
204204
'

shell.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
# Build options
1414
icu ? pkgs.icu,
1515
withAmaro ? true,
16+
withQuic ? false,
1617
withSQLite ? true,
1718
withSSL ? true,
1819
withTemporal ? false,
1920
sharedLibDeps ? import ./tools/nix/sharedLibDeps.nix {
2021
inherit
2122
pkgs
23+
withQuic
2224
withSQLite
2325
withSSL
2426
withTemporal
@@ -81,6 +83,7 @@ pkgs.mkShell {
8183
]
8284
++ extraConfigFlags
8385
++ pkgs.lib.optional (!withAmaro) "--without-amaro"
86+
++ pkgs.lib.optional withQuic "--experimental-quic"
8487
++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
8588
++ pkgs.lib.optional (!withSSL) "--without-ssl"
8689
++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"

tools/nix/sharedLibDeps.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
pkgs ? import ./pkgs.nix { },
3+
withQuic ? false,
34
withSQLite ? true,
45
withSSL ? true,
56
withTemporal ? false,
@@ -12,8 +13,6 @@
1213
gtest
1314
libuv
1415
nbytes
15-
nghttp3
16-
ngtcp2
1716
simdjson
1817
simdutf
1918
uvwasi
@@ -33,6 +32,12 @@
3332
];
3433
};
3534
}
35+
// (pkgs.lib.optionalAttrs withQuic {
36+
inherit (pkgs)
37+
nghttp3
38+
ngtcp2
39+
;
40+
})
3641
// (pkgs.lib.optionalAttrs withSQLite {
3742
inherit (pkgs) sqlite;
3843
})

0 commit comments

Comments
 (0)