tools: share CI and benchmark build configuration

Benchmark builds kept Temporal enabled on macOS after the Nix default
changed, while shared-library CI disabled it. This forced benchmarks
to rebuild V8 instead of reusing the cached derivation.

Define the common Nix flags in a composite action used by both workflows
to keep their build configurations aligned.

Signed-off-by: Filip Skokan <panva.ip@gmail.com>
Assisted-by: Codex

Author: panva

.github/actions/shared-build-config/action.yml

@@ -0,0 +1,40 @@
+name: Shared-library build configuration
+description: Common Nix build flags for shared-library CI and benchmarks.
+
+inputs:
+  with-perfetto:
+    description: Whether to enable Perfetto
+    default: 'false'
+
+outputs:
+  nix-flags:
+    description: Shell-escaped arguments for nix-shell
+    value: ${{ steps.config.outputs.nix-flags }}
+
+runs:
+  using: composite
+  steps:
+    - id: config
+      shell: bash
+      run: |
+        args=(
+          --arg useSeparateDerivationForV8 true
+          --arg loadJSBuiltinsDynamically false
+          --arg devTools '[]'
+          --arg benchmarkTools '[]'
+          --arg withPerfetto "$WITH_PERFETTO"
+        )
+        if [[ "$RUNNER_OS" == macOS ]]; then
+          args+=(
+            --arg withAmaro false
+            --arg withFFI false
+            --arg withLief false
+            --arg withSQLite false
+            --arg withTemporal false
+            --arg extraConfigFlags '["--without-inspector" "--without-node-options"]'
+          )
+        fi
+        printf -v flags '%q ' "${args[@]}"
+        echo "nix-flags=$flags" >> "$GITHUB_OUTPUT"
+      env:
+        WITH_PERFETTO: ${{ inputs.with-perfetto }}

.github/workflows/benchmark.yml

@@ -114,19 +114,21 @@ jobs:
             core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
+      - name: Configure shared-library build
+        id: build-config
+        uses: $/.github/actions/shared-build-config
+        with:
+          with-perfetto: ${{ matrix.perfetto || false }}
+
       - name: Build Node.js on the base commit
         run: |
           nix-shell \
             -I nixpkgs=./tools/nix/pkgs.nix \
             --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 \
+            ${{ steps.build-config.outputs.nix-flags }} \
             --arg ccache '(import <nixpkgs> {}).sccache' \
-            --arg devTools '[]' \
-            --arg benchmarkTools '[]' \
             --run '
               make build-ci -j4 V=1 && sccache --stop-server
             '
@@ -141,12 +143,8 @@ 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 \
+            ${{ steps.build-config.outputs.nix-flags }} \
             --arg ccache '(import <nixpkgs> {}).sccache' \
-            --arg devTools '[]' \
-            --arg benchmarkTools '[]' \
             --run '
                 make build-ci -j4 V=1
             '

.github/workflows/build-shared.yml

@@ -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
@@ -78,17 +83,21 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
             core.exportVariable('NIX_SCCACHE', '(import <nixpkgs> {}).sccache');
 
+      - name: Configure shared-library build
+        id: build-config
+        uses: $/.github/actions/shared-build-config
+        with:
+          with-perfetto: ${{ inputs.with-perfetto }}
+
       - name: Build Node.js and run tests
         shell: bash
         run: |
           nix-shell \
             -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 \
+            ${{ steps.build-config.outputs.nix-flags }} \
             --arg ccache "${NIX_SCCACHE:-null}" \
-            --arg devTools '[]' \
-            --arg benchmarkTools '[]' \
             --arg pkcs11 ${{ inputs.pkcs11-store-test }} \
             ${{ inputs.extra-nix-flags }} \
             --run '

.github/workflows/test-shared.yml

@@ -54,6 +54,7 @@ on:
       - .**
       - '!.github/workflows/test-shared.yml'
       - '!.github/workflows/build-shared.yml'
+      - '!.github/actions/shared-build-config/**'
     types: [opened, synchronize, reopened, ready_for_review]
   push:
     branches:
@@ -111,6 +112,7 @@ on:
       - .**
       - '!.github/workflows/test-shared.yml'
       - '!.github/workflows/build-shared.yml'
+      - '!.github/actions/shared-build-config/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -165,19 +167,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 }}
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}