Skip to content

tools: share CI and benchmark build configuration #66351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 3 commits into from
Oct 3, 2026
Merged

tools: share CI and benchmark build configuration #66351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fcd532
tools: share CI and benchmark build configuration
panva Sep 27, 2026
b6cf7d8
fixup! tools: share CI and benchmark build configuration
panva Sep 28, 2026
52f23c9
fixup! tools: share CI and benchmark build configuration
panva Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,11 @@ jobs:
--pure --keep TAR_DIR --keep FLAKY_TESTS \
--keep SCCACHE_GHA_ENABLED --keep SCCACHE_GHA_RW_MODE \
--keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
--arg useSeparateDerivationForV8 true \
--arg withPerfetto ${{ matrix.perfetto || false }} \
--arg loadJSBuiltinsDynamically false \
--arg ccache '(import <nixpkgs> {}).sccache' \
--arg devTools '[]' \
--arg benchmarkTools '[]' \
--run '
make build-ci -j4 V=1 && sccache --stop-server
'
' tools/nix/ci-shell.nix
mv out/Release/node base_node

- name: Checkout the merge commit
Expand All @@ -141,15 +137,11 @@ jobs:
nix-shell \
-I nixpkgs=./tools/nix/pkgs.nix \
--pure --keep SCCACHE_LOCAL_RW_MODE \
--arg useSeparateDerivationForV8 true \
--arg withPerfetto ${{ matrix.perfetto || false }} \
--arg loadJSBuiltinsDynamically false \
--arg ccache '(import <nixpkgs> {}).sccache' \
--arg devTools '[]' \
--arg benchmarkTools '[]' \
--run '
make build-ci -j4 V=1
'
' tools/nix/ci-shell.nix
env:
SCCACHE_LOCAL_RW_MODE: READ_ONLY

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/build-shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ on:
required: false
type: boolean
default: false
with-perfetto:
description: Whether to enable Perfetto
required: false
type: boolean
default: false
v8-nar:
description: An optional name for the NAR archive for V8 that needs to be downloaded
required: false
Expand Down Expand Up @@ -85,12 +90,10 @@ jobs:
-I "nixpkgs=$TAR_DIR/tools/nix/pkgs.nix" \
--pure --keep TAR_DIR --keep FLAKY_TESTS \
--keep SCCACHE_GHA_ENABLED --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
--arg loadJSBuiltinsDynamically false \
--arg withPerfetto ${{ inputs.with-perfetto }} \
--arg ccache "${NIX_SCCACHE:-null}" \
--arg devTools '[]' \
--arg benchmarkTools '[]' \
--arg pkcs11 ${{ inputs.pkcs11-store-test }} \
${{ inputs.extra-nix-flags }} \
--run '
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
' "$TAR_DIR/shell.nix"
' "$TAR_DIR/tools/nix/ci-shell.nix"
16 changes: 2 additions & 14 deletions .github/workflows/test-shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,7 @@ jobs:
with:
runner: ${{ matrix.runner }}
with-sccache: ${{ github.base_ref == 'main' || github.ref_name == 'main' }}
extra-nix-flags: |
--arg useSeparateDerivationForV8 true \
${{ matrix.perfetto && '--arg withPerfetto true \' || '\' }}
${{ endsWith(matrix.system, '-darwin') && '\
--arg withAmaro false \
--arg withFFI false \
--arg withLief false \
--arg withSQLite false \
--arg withTemporal false \
--arg extraConfigFlags ''[
"--without-inspector"
"--without-node-options"
]'' \' || '\' }}
with-perfetto: ${{ matrix.perfetto || false }}
Comment thread
panva marked this conversation as resolved.
Outdated
secrets:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

Expand Down Expand Up @@ -209,7 +197,7 @@ jobs:
id: v8-drv
run: |
V8_DRV=$(
nix-instantiate -E "builtins.filter (p: p.pname == ''v8'') (import $TAR_DIR/shell.nix { useSeparateDerivationForV8=true; }).buildInputs"
nix-instantiate -E "builtins.filter (p: p.pname == ''v8'') (import $TAR_DIR/tools/nix/ci-shell.nix {}).buildInputs"
)
V8_STORE_PATH=$(nix-store -q --outputs "$V8_DRV")
echo "V8_DRV=$V8_DRV" >> "$GITHUB_OUTPUT"
Expand Down
25 changes: 25 additions & 0 deletions tools/nix/ci-shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
args@{
pkgs ? import ./pkgs.nix { },
...
}:
import ../../shell.nix (
{
inherit pkgs;
useSeparateDerivationForV8 = true;
loadJSBuiltinsDynamically = false;
devTools = [ ];
benchmarkTools = [ ];
}
// pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
withAmaro = false;
withFFI = false;
withLief = false;
withSQLite = false;
withTemporal = false;
extraConfigFlags = [
"--without-inspector"
"--without-node-options"
];
}
Comment thread
aduh95 marked this conversation as resolved.
Outdated
// args
)
Loading