Skip to content

Commit 20f55bf

Browse files
committed
tools: run CI with shared libs on GHA
1 parent 6626b16 commit 20f55bf

File tree

10 files changed

+341
-24
lines changed

10 files changed

+341
-24
lines changed

.github/workflows/test-shared.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: Test Shared librairies
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- .mailmap
7+
- README.md
8+
- .github/**
9+
- '!.github/workflows/test-shared.yml'
10+
types: [opened, synchronize, reopened, ready_for_review]
11+
push:
12+
branches:
13+
- main
14+
- canary
15+
- v[0-9]+.x-staging
16+
- v[0-9]+.x
17+
paths-ignore:
18+
- .mailmap
19+
- README.md
20+
- .github/**
21+
- '!.github/workflows/test-shared.yml'
22+
23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
25+
cancel-in-progress: true
26+
27+
env:
28+
FLAKY_TESTS: keep_retrying
29+
NIXPKGS_REPO: https://github.com/NixOS/nixpkgs
30+
NIXPKGS_PIN: d74de548348c46cf25cb1fcc4b74f38103a4590d
31+
32+
permissions:
33+
contents: read
34+
35+
jobs:
36+
build:
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
include:
41+
- runner: ubuntu-24.04
42+
system: x86_64-linux
43+
- runner: ubuntu-24.04-arm
44+
system: aarch64-linux
45+
- runner: macos-13
46+
system: x86_64-darwin
47+
- runner: macos-14
48+
system: aarch64-darwin
49+
name: '${{ matrix.system }}: with shared libraries'
50+
runs-on: ${{ matrix.runner }}
51+
steps:
52+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
53+
54+
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
55+
with:
56+
extra_nix_config: sandbox = true
57+
github_access_token: ${{ secrets.GITHUB_TOKEN }}
58+
nix_path: nixpkgs=${{ env.NIXPKGS_REPO }}/archive/${{ env.NIXPKGS_PIN }}.tar.gz
59+
60+
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
61+
with:
62+
name: nodejs
63+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
64+
65+
- name: Configure sccache
66+
run: echo "SCCACHE_DIR=$RUNNER_TEMP/sscache" >> "$GITHUB_ENV"
67+
68+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
69+
with:
70+
key: nixpkgs-sscache-${{ runner.os }}-${{ runner.arch }}
71+
path: ${{ env.SCCACHE_DIR }}
72+
73+
- name: Build Node.js and run tests
74+
run: |
75+
nix-shell \
76+
--pure \
77+
--arg loadJSBuiltinsDynamically false \
78+
--arg ccache '(import <nixpkgs> {}).sccache' \
79+
--arg devTools '[]' \
80+
--arg benchmarkTools '[]' \
81+
--run '
82+
make run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
83+
'

.github/workflows/tools.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ on:
3030
- llhttp
3131
- minimatch
3232
- nbytes
33+
- nixpkgs-unstable
3334
- nghttp2
3435
- nghttp3
3536
- ngtcp2
@@ -198,6 +199,14 @@ jobs:
198199
cat temp-output
199200
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
200201
rm temp-output
202+
- id: nixpkgs-unstable
203+
subsystem: tools
204+
label: tools
205+
run: |
206+
./tools/dep_updaters/update-nixpkgs-pin.sh > temp-output
207+
cat temp-output
208+
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
209+
rm temp-output
201210
- id: nghttp2
202211
subsystem: deps
203212
label: dependencies

BUILDING.md

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ Consult previous versions of this document for older versions of Node.js:
239239

240240
Installation via Linux package manager can be achieved with:
241241

242+
* Nix, NixOS: `nix-shell`
242243
* Ubuntu, Debian: `sudo apt-get install python3 g++-12 gcc-12 make python3-pip`
243244
* Fedora: `sudo dnf install python3 gcc-c++ make python3-pip`
244245
* CentOS and RHEL: `sudo yum install python3 gcc-c++ make python3-pip`
@@ -259,6 +260,75 @@ installed, you can find them under the menu `Xcode -> Open Developer Tool ->
259260
More Developer Tools...`. This step will install `clang`, `clang++`, and
260261
`make`.
261262

263+
#### Nix integration
264+
265+
If you are using Nix and direnv, you can use the following to get started:
266+
267+
```bash
268+
echo 'use_nix --arg sharedLibDeps {} --argstr icu small' > .envrc
269+
direnv allow .
270+
make build-ci -j12
271+
```
272+
273+
The use of `make build-ci` is to ensure you are using the `CONFIG_FLAGS`
274+
environment variable. You can also specify it manually:
275+
276+
```sh
277+
./configure $CONFIG_FLAGS
278+
make -j12
279+
```
280+
281+
Passing the `--arg sharedLibDeps {}` instructs direnv and Nix to generate an
282+
environment that uses the vendored-in native dependencies. Using the vendored-in
283+
dependencies result in a result closer to the official binaries, the tradeoff
284+
being the build will take longer to complete as you'd have to build those
285+
dependencies instead of using the cached ones from the Nix cache. You can omit
286+
that flag to use all the shared dependencies, or specify only some dependencies:
287+
288+
```bash
289+
cat -> .envrc <<'EOF'
290+
use nix --arg sharedLibDeps '{
291+
inherit (import <nixpkgs> {})
292+
openssl
293+
zlib
294+
;
295+
}'
296+
EOF
297+
```
298+
299+
Passing the `--argstr icu small` instructs direnv and Nix to pass `--with-intl=small` in
300+
the `CONFIG_FLAGS` environment variable. If you omit this, the prebuilt ICU from Nix cache
301+
will be used, which should speed up greatly compilation time.
302+
303+
The use of `direnv` is completely optional, you can also use `nix-shell` directly,
304+
e.g. here's a command you can use to build a binary for benchmarking purposes:
305+
306+
```bash
307+
# Passing `--arg loadJSBuiltinsDynamically false` to instruct the compiler to
308+
# embed the JS core files so it is no longer affected by local changes
309+
# (necessary for getting useful benchmark results).
310+
# Passing `--arg devTools '[]' --arg benchmarkTools '[]'` since we don't need
311+
# those to build node.
312+
nix-shell \
313+
--arg loadJSBuiltinsDynamically false \
314+
--arg devTools '[]' --arg benchmarkTools '[]' \
315+
--run 'make build-ci -j12'
316+
317+
mv out/Release/node ./node_old
318+
319+
# ...
320+
# Make your local changes, and re-build node
321+
322+
nix-shell \
323+
--arg loadJSBuiltinsDynamically false \
324+
--arg devTools '[]' --arg benchmarkTools '[]' \
325+
--run 'make build-ci -j12'
326+
327+
nix-shell --pure --run './node benchmark/compare.js --old ./node_old --new ./node http | Rscript benchmark/compare.R'
328+
```
329+
330+
There are additional attributes you can pass, see `shell.nix` file for more details.
331+
262332
#### Building Node.js
263333

264334
If the path to your build directory contains a space, the build will likely
@@ -267,7 +337,6 @@ fail.
267337
To build Node.js:
268338

269339
```bash
270-
export CXX=g++-12
271340
./configure
272341
make -j4
273342
```

deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/contributing/writing-and-running-benchmarks.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Basic Unix tools are required for some benchmarks.
2626
[Git for Windows][git-for-windows] includes Git Bash and the necessary tools,
2727
which need to be included in the global Windows `PATH`.
2828

29+
If you are using Nix, all the required tools are already listed in the
30+
`benchmarkTools` argument of the `shell.nix` file, so you can skip those
31+
prerequesites.
32+
2933
### HTTP benchmark requirements
3034

3135
Most of the HTTP benchmarks require a benchmarker to be installed. This can be

node.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@
848848
'deps/googletest/googletest.gyp:gtest_prod',
849849
'deps/histogram/histogram.gyp:histogram',
850850
'deps/nbytes/nbytes.gyp:nbytes',
851+
'deps/uvwasi/uvwasi.gyp:uvwasi',
851852
'tools/v8_gypfiles/abseil.gyp:abseil',
852853
'node_js2c#host',
853854
],

shell.nix

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
pkgs ? import <nixpkgs> {},
3+
loadJSBuiltinsDynamically ? true, # Load `lib/**.js` from disk instead of embedding
4+
ncu-path ? null, # Provide this if you want to use a local version of NCU
5+
icu ? pkgs.icu,
6+
sharedLibDeps ? {
7+
inherit (pkgs)
8+
ada
9+
brotli
10+
c-ares
11+
libuv
12+
nghttp2
13+
nghttp3
14+
ngtcp2
15+
openssl
16+
simdjson
17+
sqlite
18+
zlib
19+
zstd
20+
;
21+
http-parser = pkgs.llhttp;
22+
simdutf = pkgs.simdutf.overrideAttrs {
23+
version = "6.5.0";
24+
25+
src = pkgs.fetchFromGitHub {
26+
owner = "simdutf";
27+
repo = "simdutf";
28+
tag = "v6.5.0";
29+
hash = "sha256-bZ4r62GMz2Dkd3fKTJhelitaA8jUBaDjG6jOysEg8Nk=";
30+
};
31+
};
32+
uvwasi = pkgs.uvwasi.overrideAttrs {
33+
version = "0.0.22";
34+
35+
src = pkgs.fetchFromGitHub {
36+
owner = "nodejs";
37+
repo = "uvwasi";
38+
rev = "refs/heads/v0.0.22-proposal";
39+
hash = "sha256-vrtL9HDzbbbx3QmRsifRzNTYilC4zgo9JmJoA9haUFQ=";
40+
};
41+
postPatch = "";
42+
};
43+
},
44+
ccache ? pkgs.ccache,
45+
ninja ? pkgs.ninja,
46+
devTools ? [
47+
pkgs.curl
48+
pkgs.gh
49+
pkgs.git
50+
pkgs.jq
51+
pkgs.shellcheck
52+
] ++ (if (ncu-path == null) then [
53+
pkgs.node-core-utils
54+
] else [
55+
(pkgs.writeShellScriptBin "git-node" "exec \"${ncu-path}/bin/git-node.js\" \"$@\"")
56+
(pkgs.writeShellScriptBin "ncu-ci" "exec \"${ncu-path}/bin/ncu-ci.js\" \"$@\"")
57+
(pkgs.writeShellScriptBin "ncu-config" "exec \"${ncu-path}/bin/ncu-config.js\" \"$@\"")
58+
]),
59+
benchmarkTools ? [
60+
pkgs.R
61+
pkgs.rPackages.ggplot2
62+
pkgs.rPackages.plyr
63+
pkgs.wrk
64+
],
65+
extraConfigFlags ? [
66+
"--without-npm"
67+
"--debug-node"
68+
],
69+
}:
70+
71+
let
72+
useSharedICU = if builtins.isString icu then icu == "system" else icu != null;
73+
useSharedAda = builtins.hasAttr "ada" sharedLibDeps;
74+
useSharedOpenSSL = builtins.hasAttr "openssl" sharedLibDeps;
75+
in
76+
pkgs.mkShell {
77+
inherit (pkgs.nodejs_latest) nativeBuildInputs;
78+
79+
buildInputs = builtins.attrValues sharedLibDeps ++ pkgs.lib.optionals useSharedICU [ icu ];
80+
81+
packages = [
82+
ccache
83+
] ++ devTools ++ benchmarkTools;
84+
85+
shellHook = if (ccache != null) then ''
86+
export CC="${pkgs.lib.getExe ccache} $CC"
87+
export CXX="${pkgs.lib.getExe ccache} $CXX"
88+
'' else "";
89+
90+
BUILD_WITH = if (ninja != null) then "ninja" else "make";
91+
NINJA = if (ninja != null) then "${pkgs.lib.getExe ninja}" else "";
92+
CI_SKIP_TESTS = pkgs.lib.concatStringsSep "," ([
93+
] ++ pkgs.lib.optionals useSharedAda [
94+
# Different versions of Ada affect the WPT tests
95+
"test-url"
96+
] ++ pkgs.lib.optionals useSharedOpenSSL [
97+
# Path to the openssl.cnf is different from the expected one
98+
"test-strace-openat-openssl"
99+
]);
100+
CONFIG_FLAGS = builtins.toString ([
101+
(if icu == null
102+
then "--without-intl"
103+
else "--with-intl=${if useSharedICU then "system" else icu}-icu")
104+
] ++ extraConfigFlags ++ pkgs.lib.optionals (ninja != null) [
105+
"--ninja"
106+
] ++ pkgs.lib.optionals loadJSBuiltinsDynamically [
107+
"--node-builtin-modules-path=${builtins.toString ./.}"
108+
] ++ pkgs.lib.concatMap (name: [
109+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}"
110+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-libpath=${
111+
pkgs.lib.getLib sharedLibDeps.${name}
112+
}/lib"
113+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-include=${
114+
pkgs.lib.getInclude sharedLibDeps.${name}
115+
}/include"
116+
]) (builtins.attrNames sharedLibDeps));
117+
}

0 commit comments

Comments
 (0)