diff --git a/.github/workflows/test-shared.yml b/.github/workflows/test-shared.yml index 96e862c35916..35a791c74df7 100644 --- a/.github/workflows/test-shared.yml +++ b/.github/workflows/test-shared.yml @@ -147,8 +147,6 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux - # Exercise the trace-event code against a perfetto-enabled V8. - perfetto: true # built separately in build-aarch64-linux-v8 # - runner: ubuntu-24.04-arm # system: aarch64-linux @@ -156,15 +154,23 @@ jobs: system: x86_64-darwin - runner: macos-latest system: aarch64-darwin - name: '${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}' + name: '${{ matrix.system }}: with shared libraries' uses: ./.github/workflows/build-shared.yml 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 withLief false --arg withSQLite false --arg withFFI false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }} + ${{ endsWith(matrix.system, '-darwin') && '\ + --arg withAmaro false \ + --arg withFFI false \ + --arg withLief false \ + --arg withPerfetto false \ + --arg withSQLite false \ + --arg extraConfigFlags ''[ + "--without-inspector" + "--without-node-options" + ]'' \' || '\' }} secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} diff --git a/configure.py b/configure.py index 99ce9326dc93..42dcd5697b17 100755 --- a/configure.py +++ b/configure.py @@ -1140,11 +1140,11 @@ default=None, help='disable the V8 inspector protocol') -parser.add_argument('--with-perfetto', +parser.add_argument('--without-perfetto', action='store_true', - dest='with_perfetto', + dest='without_perfetto', default=None, - help='enable perfetto support') + help='disable perfetto support') parser.add_argument('--shared', action='store_true', @@ -2242,7 +2242,7 @@ def configure_v8(o, configs): options.v8_disable_temporal_support = True o['variables']['v8_enable_temporal_support'] = 0 if options.v8_disable_temporal_support else 1 o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0 - o['variables']['v8_use_perfetto'] = 1 if options.with_perfetto else 0 + o['variables']['v8_use_perfetto'] = 0 if options.without_perfetto else 1 o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform) o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8) o['variables']['force_dynamic_crt'] = 1 if options.shared else 0 diff --git a/shell.nix b/shell.nix index 0bc13ec5c2f1..fb94abfeb24c 100644 --- a/shell.nix +++ b/shell.nix @@ -19,7 +19,7 @@ withFFI ? true, withSSL ? true, withTemporal ? false, - withPerfetto ? false, + withPerfetto ? true, sharedLibDeps ? ( import ./tools/nix/sharedLibDeps.nix { inherit @@ -80,7 +80,7 @@ let ++ pkgs.lib.optional (builtins.hasAttr "abseil" sharedLibDeps) "--shared-abseil" ++ pkgs.lib.optional (builtins.hasAttr "highway" sharedLibDeps) "--shared-highway" ++ pkgs.lib.optional (withTemporal && useSharedTemporal) "--shared-temporal_capi" - ++ pkgs.lib.optional withPerfetto "--with-perfetto"; + ++ pkgs.lib.optional (!withPerfetto) "--without-perfetto"; in pkgs.mkShell { inherit nativeBuildInputs; diff --git a/tools/nix/v8.nix b/tools/nix/v8.nix index 98df8b769c2a..b665f3863e84 100644 --- a/tools/nix/v8.nix +++ b/tools/nix/v8.nix @@ -47,7 +47,7 @@ let ] ++ lib.optional (!useSharedAbseil) ../../tools/v8_gypfiles/abseil.gyp ++ lib.optional (!useSharedHighway) ../../tools/v8_gypfiles/highway.gyp - ++ lib.optionals (builtins.elem "--with-perfetto" configureFlags) [ + ++ lib.optionals (!builtins.elem "--without-perfetto" configureFlags) [ ../../deps/perfetto ] ++ lib.optionals (icu != null) [