tools: cache V8 on test-shared workflow

Author: aduh95

.github/workflows/test-shared.yml

@@ -182,25 +182,19 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_SERVICE_V2', 'on');
             core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Load shell.nix
-        if: github.event_name != 'workflow_dispatch'
-        run: |
-          mv "$TAR_DIR"/*.nix .
-          mkdir tools
-          mv "$TAR_DIR"/tools/nix tools/.
+            core.exportVariable('NIX_SCCACHE', '(import <nixpkgs> {}).sccache');
 
       - name: Build Node.js and run tests
         run: |
           nix-shell \
-            -I nixpkgs=./tools/nix/pkgs.nix \
+            -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 ccache '(import <nixpkgs> {}).sccache' \
+            --arg ccache "${NIX_SCCACHE:-null}" \
             --arg devTools '[]' \
             --arg benchmarkTools '[]' \
             ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
             --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"

configure.py

@@ -1090,6 +1090,13 @@
     help='do not use V8 includes from the bundled deps folder. ' +
          '(This mode is not officially supported for regular applications)')
 
+parser.add_argument('--external-v8',
+    action='store',
+    dest='external_v8_path',
+    default=False,
+    help='Path to shared V8. ' +
+         '(This mode is not officially supported for regular applications)')
+
 parser.add_argument('--verbose',
     action='store_true',
     dest='verbose',
@@ -2068,6 +2075,11 @@ def configure_v8(o, configs):
     raise Exception('--enable-d8 is incompatible with --without-bundled-v8.')
   if options.without_bundled_v8 and options.enable_v8windbg:
     raise Exception('--enable-v8windbg is incompatible with --without-bundled-v8.')
+  if options.external_v8_path:
+    if not options.without_bundled_v8:
+      raise Exception('--external-v8 requires --without-bundled-v8.')
+    output['libraries'] += [f"-L{options.external_v8_path}/lib", '-lv8']
+    output['include_dirs'] += [f"-L{options.external_v8_path}/include"]
   if options.static_zoslib_gyp:
     o['variables']['static_zoslib_gyp'] = options.static_zoslib_gyp
   if flavor != 'linux' and options.v8_enable_hugepage:

shell.nix

@@ -27,6 +27,7 @@
       withTemporal
       ;
   },
+  cachedV8 ? pkgs.callPackage ./tools/nix/v8.nix { },
 
   # dev tools (not needed to build Node.js, useful to maintain it)
   ncu-path ? null, # Provide this if you want to use a local version of NCU
@@ -83,6 +84,10 @@ pkgs.mkShell {
       )
     ]
     ++ extraConfigFlags
+    ++ pkgs.lib.optionals (cachedV8 != null) [
+      "--without-bundled-v8"
+      "--external-v8=${cachedV8}"
+    ]
     ++ pkgs.lib.optional (!withAmaro) "--without-amaro"
     ++ pkgs.lib.optional (!withLief) "--without-lief"
     ++ pkgs.lib.optional withQuic "--experimental-quic"

tools/nix/v8.nix

@@ -0,0 +1,18 @@
+{
+  lib,
+  nodejs-slim_latest,
+}:
+
+(nodejs-slim_latest.overrideAttrs (old: {
+  prePatch = (old.prePatch or "") + ''
+    cp ${../../common.gypi} common.gypi
+    cp ${../../node.gypi} node.gypi
+    cp ${../../node.gyp} node.gyp
+    cp -r ${../../deps/v8} deps/v8
+    cp -r ${../../src} src
+    cp -r ${../../tools/gyp} tools/gyp
+    cp -r ${../../tools/make-v8.sh} tools/make-v8.sh
+    cp -r ${../../tools/v8_gypfiles} tools/v8_gypfiles
+  '';
+  doCheck = false;
+})).libv8