Skip to content

Commit 38aa4e8

Browse files
committed
build: enable Perfetto by default
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 791e2d2 commit 38aa4e8

3 files changed

Lines changed: 17 additions & 11 deletions

File tree

.github/workflows/test-shared.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,24 +147,30 @@ jobs:
147147
include:
148148
- runner: ubuntu-24.04
149149
system: x86_64-linux
150-
# Exercise the trace-event code against a perfetto-enabled V8.
151-
perfetto: true
152150
# built separately in build-aarch64-linux-v8
153151
# - runner: ubuntu-24.04-arm
154152
# system: aarch64-linux
155153
- runner: macos-15-intel
156154
system: x86_64-darwin
157155
- runner: macos-latest
158156
system: aarch64-darwin
159-
name: '${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}'
157+
name: '${{ matrix.system }}: with shared libraries'
160158
uses: ./.github/workflows/build-shared.yml
161159
with:
162160
runner: ${{ matrix.runner }}
163161
with-sccache: ${{ github.base_ref == 'main' || github.ref_name == 'main' }}
164162
extra-nix-flags: |
165163
--arg useSeparateDerivationForV8 true \
166-
${{ matrix.perfetto && '--arg withPerfetto true \' || '\' }}
167-
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg withFFI false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
164+
${{ endsWith(matrix.system, '-darwin') && '\
165+
--arg withAmaro false \
166+
--arg withFFI false \
167+
--arg withLief false \
168+
--arg withPerfetto false \
169+
--arg withSQLite false \
170+
--arg extraConfigFlags ''[
171+
"--without-inspector"
172+
"--without-node-options"
173+
]'' \' || '\' }}
168174
secrets:
169175
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
170176

configure.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,11 +1140,11 @@
11401140
default=None,
11411141
help='disable the V8 inspector protocol')
11421142

1143-
parser.add_argument('--with-perfetto',
1143+
parser.add_argument('--without-perfetto',
11441144
action='store_true',
1145-
dest='with_perfetto',
1145+
dest='without_perfetto',
11461146
default=None,
1147-
help='enable perfetto support')
1147+
help='disable perfetto support')
11481148

11491149
parser.add_argument('--shared',
11501150
action='store_true',
@@ -2242,7 +2242,7 @@ def configure_v8(o, configs):
22422242
options.v8_disable_temporal_support = True
22432243
o['variables']['v8_enable_temporal_support'] = 0 if options.v8_disable_temporal_support else 1
22442244
o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
2245-
o['variables']['v8_use_perfetto'] = 1 if options.with_perfetto else 0
2245+
o['variables']['v8_use_perfetto'] = 0 if options.without_perfetto else 1
22462246
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
22472247
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
22482248
o['variables']['force_dynamic_crt'] = 1 if options.shared else 0

shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
withFFI ? true,
2020
withSSL ? true,
2121
withTemporal ? false,
22-
withPerfetto ? false,
22+
withPerfetto ? true,
2323
sharedLibDeps ? (
2424
import ./tools/nix/sharedLibDeps.nix {
2525
inherit
@@ -80,7 +80,7 @@ let
8080
++ pkgs.lib.optional (builtins.hasAttr "abseil" sharedLibDeps) "--shared-abseil"
8181
++ pkgs.lib.optional (builtins.hasAttr "highway" sharedLibDeps) "--shared-highway"
8282
++ pkgs.lib.optional (withTemporal && useSharedTemporal) "--shared-temporal_capi"
83-
++ pkgs.lib.optional withPerfetto "--with-perfetto";
83+
++ pkgs.lib.optional (!withPerfetto) "--without-perfetto";
8484
in
8585
pkgs.mkShell {
8686
inherit nativeBuildInputs;

0 commit comments

Comments
 (0)