Skip to content

Commit 21c8bb4

Browse files
committed
tools: align macOS benchmark builds with CI
The Nix shell now enables Temporal by default, while shared-library CI disables it on macOS. Match its flags in both benchmark builds to reuse the same V8 derivation and compiler cache. Signed-off-by: Filip Skokan <panva.ip@gmail.com> Assisted-by: Codex
1 parent 5137638 commit 21c8bb4

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

‎.github/workflows/benchmark.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
115115
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
116116
117+
# Keep both builds in sync with the flags in test-shared.yml.
117118
- name: Build Node.js on the base commit
118119
run: |
119120
nix-shell \
@@ -123,6 +124,16 @@ jobs:
123124
--keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
124125
--arg useSeparateDerivationForV8 true \
125126
--arg withPerfetto ${{ matrix.perfetto || false }} \
127+
${{ endsWith(matrix.system, '-darwin') && '\
128+
--arg withAmaro false \
129+
--arg withFFI false \
130+
--arg withLief false \
131+
--arg withSQLite false \
132+
--arg withTemporal false \
133+
--arg extraConfigFlags ''[
134+
"--without-inspector"
135+
"--without-node-options"
136+
]'' \' || '\' }}
126137
--arg loadJSBuiltinsDynamically false \
127138
--arg ccache '(import <nixpkgs> {}).sccache' \
128139
--arg devTools '[]' \
@@ -143,6 +154,16 @@ jobs:
143154
--pure --keep SCCACHE_LOCAL_RW_MODE \
144155
--arg useSeparateDerivationForV8 true \
145156
--arg withPerfetto ${{ matrix.perfetto || false }} \
157+
${{ endsWith(matrix.system, '-darwin') && '\
158+
--arg withAmaro false \
159+
--arg withFFI false \
160+
--arg withLief false \
161+
--arg withSQLite false \
162+
--arg withTemporal false \
163+
--arg extraConfigFlags ''[
164+
"--without-inspector"
165+
"--without-node-options"
166+
]'' \' || '\' }}
146167
--arg loadJSBuiltinsDynamically false \
147168
--arg ccache '(import <nixpkgs> {}).sccache' \
148169
--arg devTools '[]' \

‎.github/workflows/test-shared.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ jobs:
165165
with:
166166
runner: ${{ matrix.runner }}
167167
with-sccache: ${{ github.base_ref == 'main' || github.ref_name == 'main' }}
168+
# Keep these flags in sync with both builds in benchmark.yml.
168169
extra-nix-flags: |
169170
--arg useSeparateDerivationForV8 true \
170171
${{ matrix.perfetto && '--arg withPerfetto true \' || '\' }}

0 commit comments

Comments
 (0)