Skip to content

Commit db22da5

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

File tree

6 files changed

+256
-1
lines changed

6 files changed

+256
-1
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+
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
63+
name: nodejs
64+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_2 }}
65+
66+
- name: Configure sccache
67+
run: echo "SCCACHE_DIR=$RUNNER_TEMP/sscache" >> "$GITHUB_ENV"
68+
69+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
70+
with:
71+
key: nixpkgs-sscache-${{ runner.os }}-${{ runner.arch }}
72+
path: ${{ env.SCCACHE_DIR }}
73+
74+
- name: Build Node.js and run tests
75+
run: |
76+
nix-shell \
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: 11 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,16 @@ 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+
```
268+
echo 'use_nix --attr sharedLibDeps {}' > .envrc
269+
direnv allow .
270+
make build-ci -j12
271+
```
272+
262273
#### Building Node.js
263274

264275
If the path to your build directory contains a space, the build will likely
@@ -267,7 +278,6 @@ fail.
267278
To build Node.js:
268279

269280
```bash
270-
export CXX=g++-12
271281
./configure
272282
make -j4
273283
```

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: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
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+
shared-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+
],
64+
extraConfigFlags ? [
65+
"--without-npm"
66+
"--debug-node"
67+
],
68+
}:
69+
70+
let
71+
useSharedICU = if builtins.isString shared-icu then shared-icu == "system" else shared-icu != null;
72+
useSharedAda = builtins.hasAttr "ada" sharedLibDeps;
73+
useSharedOpenSSL = builtins.hasAttr "openssl" sharedLibDeps;
74+
in
75+
pkgs.mkShell {
76+
inherit (pkgs.nodejs_latest) nativeBuildInputs;
77+
78+
buildInputs = builtins.attrValues sharedLibDeps ++ pkgs.lib.optionals useSharedICU [ shared-icu ];
79+
80+
packages = [
81+
ccache
82+
] ++ devTools ++ benchmarkTools;
83+
84+
shellHook = if (ccache != null) then ''
85+
export CC="${pkgs.lib.getExe ccache} $CC"
86+
export CXX="${pkgs.lib.getExe ccache} $CXX"
87+
'' else "";
88+
89+
BUILD_WITH = if (ninja != null) then "ninja" else "make";
90+
NINJA = if (ninja != null) then "${pkgs.lib.getExe ninja}" else "";
91+
CI_SKIP_TESTS = pkgs.lib.concatStringsSep "," ([
92+
] ++ pkgs.lib.optionals useSharedAda [
93+
# Different versions of Ada affect the WPT tests
94+
"test-url"
95+
] ++ pkgs.lib.optionals useSharedOpenSSL [
96+
# Path to the openssl.cnf is different from the expected one
97+
"test-strace-openat-openssl"
98+
]);
99+
CONFIG_FLAGS = builtins.toString ([
100+
(if shared-icu == null
101+
then "--without-intl"
102+
else "--with-intl=${if useSharedICU then "system" else shared-icu}-icu")
103+
] ++ extraConfigFlags ++ pkgs.lib.optionals (ninja != null) [
104+
"--ninja"
105+
] ++ pkgs.lib.optionals loadJSBuiltinsDynamically [
106+
"--node-builtin-modules-path=${builtins.toString ./.}"
107+
] ++ pkgs.lib.concatMap (name: [
108+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}"
109+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-libpath=${
110+
pkgs.lib.getLib sharedLibDeps.${name}
111+
}/lib"
112+
"--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-include=${
113+
pkgs.lib.getInclude sharedLibDeps.${name}
114+
}/include"
115+
]) (builtins.attrNames sharedLibDeps));
116+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/sh
2+
set -ex
3+
# Shell script to update Nixpkgs pin in the source tree to the most recent
4+
# version on the unstable channel.
5+
6+
BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
7+
WORKFLOW_FILE="$BASE_DIR/.github/workflows/test-shared.yml"
8+
9+
NIXPKGS_REPO=$(grep NIXPKGS_REPO: "$WORKFLOW_FILE" | awk -F': ' '{ print $2 }')
10+
CURRENT_VERSION_SHA1=$(grep NIXPKGS_PIN: "$WORKFLOW_FILE" | awk -F': ' '{ print $2 }')
11+
CURRENT_VERSION=$(echo "$CURRENT_UPSTREAM_SHA1" | head -c 7)
12+
13+
NEW_UPSTREAM_SHA1=$(git ls-remote "$NIXPKGS_REPO.git" nixpkgs-unstable | awk '{print $1}')
14+
NEW_VERSION=$(echo "$NEW_UPSTREAM_SHA1" | head -c 7)
15+
16+
17+
# shellcheck disable=SC1091
18+
. "$BASE_DIR/tools/dep_updaters/utils.sh"
19+
20+
compare_dependency_version "nixpkgs-unstable" "$NEW_VERSION" "$CURRENT_VERSION"
21+
22+
TMP_FILE=$(mktemp)
23+
sed "s/$CURRENT_VERSION_SHA1/$NEW_UPSTREAM_SHA1/" "$WORKFLOW_FILE" > "$TMP_FILE"
24+
mv "$TMP_FILE" "$WORKFLOW_FILE"
25+
26+
echo "All done!"
27+
echo ""
28+
echo "Please git add and commit the new version:"
29+
echo ""
30+
echo "$ git add $WORKFLOW_FILE"
31+
echo "$ git commit -m 'tools: bump nixpkgs-unstable pin to $NEW_VERSION'"
32+
echo ""
33+
34+
# The last line of the script should always print the new version,
35+
# as we need to add it to $GITHUB_ENV variable.
36+
echo "NEW_VERSION=$NEW_VERSION"

0 commit comments

Comments
 (0)