fixup! tools: share CI and benchmark build configuration

Author: panva

.github/workflows/build-shared.yml

@@ -17,11 +17,6 @@ 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
@@ -90,7 +85,6 @@ jobs:
             -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 withPerfetto ${{ inputs.with-perfetto }} \
             --arg ccache "${NIX_SCCACHE:-null}" \
             --arg pkcs11 ${{ inputs.pkcs11-store-test }} \
             ${{ inputs.extra-nix-flags }} \

.github/workflows/test-shared.yml

@@ -165,7 +165,7 @@ jobs:
     with:
       runner: ${{ matrix.runner }}
       with-sccache: ${{ github.base_ref == 'main' || github.ref_name == 'main' }}
-      with-perfetto: ${{ matrix.perfetto || false }}
+      extra-nix-flags: ${{ matrix.perfetto && '--arg withPerfetto true' || '' }}
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 

tools/nix/ci-shell.nix

@@ -10,16 +10,19 @@ import ../../shell.nix (
     devTools = [ ];
     benchmarkTools = [ ];
   }
-  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-    withAmaro = false;
-    withFFI = false;
-    withLief = false;
-    withSQLite = false;
-    withTemporal = false;
-    extraConfigFlags = [
-      "--without-inspector"
-      "--without-node-options"
-    ];
-  }
+  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (
+    # Disable optional features on Darwin for coverage and faster CI.
+    builtins.mapAttrs (n: v: false) (
+      pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
+        builtins.functionArgs (import ../../shell.nix)
+      )
+    )
+    // {
+      extraConfigFlags = [
+        "--without-inspector"
+        "--without-node-options"
+      ];
+    }
+  )
   // args
 )