fixup! fixup! tools: run CI with shared libs on GHA

Author: aduh95

nixpkgs.nix

@@ -7,4 +7,4 @@ let
     sha256 = "1airrw6l87iyny1a3mb29l28na4s4llifprlgpll2na461jd40iy";
   }) arg;
 in
-  nixpkgs
+nixpkgs

shell.nix

@@ -1,5 +1,5 @@
 {
-  pkgs ? import "${./nixpkgs.nix}" {},
+  pkgs ? import "${./nixpkgs.nix}" { },
   loadJSBuiltinsDynamically ? true, # Load `lib/**.js` from disk instead of embedding
   ncu-path ? null, # Provide this if you want to use a local version of NCU
   icu ? pkgs.icu,
@@ -19,7 +19,7 @@
       uvwasi
       zlib
       zstd
-    ;
+      ;
     http-parser = pkgs.llhttp;
   },
   ccache ? pkgs.ccache,
@@ -30,13 +30,17 @@
     pkgs.git
     pkgs.jq
     pkgs.shellcheck
-  ] ++ (if (ncu-path == null) then [
-      pkgs.node-core-utils
-    ] else [
-      (pkgs.writeShellScriptBin "git-node" "exec \"${ncu-path}/bin/git-node.js\" \"$@\"")
-      (pkgs.writeShellScriptBin "ncu-ci" "exec \"${ncu-path}/bin/ncu-ci.js\" \"$@\"")
-      (pkgs.writeShellScriptBin "ncu-config" "exec \"${ncu-path}/bin/ncu-config.js\" \"$@\"")
-    ]),
+  ]
+  ++ (
+    if (ncu-path == null) then
+      [ pkgs.node-core-utils ]
+    else
+      [
+        (pkgs.writeShellScriptBin "git-node" "exec \"${ncu-path}/bin/git-node.js\" \"$@\"")
+        (pkgs.writeShellScriptBin "ncu-ci" "exec \"${ncu-path}/bin/ncu-ci.js\" \"$@\"")
+        (pkgs.writeShellScriptBin "ncu-config" "exec \"${ncu-path}/bin/ncu-config.js\" \"$@\"")
+      ]
+  ),
   benchmarkTools ? [
     pkgs.R
     pkgs.rPackages.ggplot2
@@ -61,38 +65,56 @@ pkgs.mkShell {
 
   packages = [
     ccache
-  ] ++ devTools ++ benchmarkTools;
+  ]
+  ++ devTools
+  ++ benchmarkTools;
 
-  shellHook = if (ccache != null) then ''
-    export CC="${pkgs.lib.getExe ccache} $CC"
-    export CXX="${pkgs.lib.getExe ccache} $CXX"
-  '' else "";
+  shellHook =
+    if (ccache != null) then
+      ''
+        export CC="${pkgs.lib.getExe ccache} $CC"
+        export CXX="${pkgs.lib.getExe ccache} $CXX"
+      ''
+    else
+      "";
 
   BUILD_WITH = if (ninja != null) then "ninja" else "make";
   NINJA = if (ninja != null) then "${pkgs.lib.getExe ninja}" else "";
-  CI_SKIP_TESTS = pkgs.lib.concatStringsSep "," ([
-    ] ++ pkgs.lib.optionals useSharedAda [
+  CI_SKIP_TESTS = pkgs.lib.concatStringsSep "," (
+    [ ]
+    ++ pkgs.lib.optionals useSharedAda [
       # Different versions of Ada affect the WPT tests
       "test-url"
-    ] ++ pkgs.lib.optionals useSharedOpenSSL [
+    ]
+    ++ pkgs.lib.optionals useSharedOpenSSL [
       # Path to the openssl.cnf is different from the expected one
       "test-strace-openat-openssl"
-    ]);
-  CONFIG_FLAGS = builtins.toString ([
-    (if icu == null
-      then "--without-intl"
-      else "--with-intl=${if useSharedICU then "system" else icu}-icu")
-  ] ++ extraConfigFlags ++ pkgs.lib.optionals (ninja != null) [
-    "--ninja"
-  ] ++ pkgs.lib.optionals loadJSBuiltinsDynamically [
-    "--node-builtin-modules-path=${builtins.toString ./.}"
-  ] ++ pkgs.lib.concatMap (name: [
-    "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}"
-    "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-libpath=${
-      pkgs.lib.getLib sharedLibDeps.${name}
-    }/lib"
-    "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-include=${
-      pkgs.lib.getInclude sharedLibDeps.${name}
-    }/include"
-  ]) (builtins.attrNames sharedLibDeps));
+    ]
+  );
+  CONFIG_FLAGS = builtins.toString (
+    [
+      (
+        if icu == null then
+          "--without-intl"
+        else
+          "--with-intl=${if useSharedICU then "system" else icu}-icu"
+      )
+    ]
+    ++ extraConfigFlags
+    ++ pkgs.lib.optionals (ninja != null) [
+      "--ninja"
+    ]
+    ++ pkgs.lib.optionals loadJSBuiltinsDynamically [
+      "--node-builtin-modules-path=${builtins.toString ./.}"
+    ]
+    ++ pkgs.lib.concatMap (name: [
+      "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}"
+      "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-libpath=${
+        pkgs.lib.getLib sharedLibDeps.${name}
+      }/lib"
+      "--shared-${builtins.replaceStrings [ "c-ares" ] [ "cares" ] name}-include=${
+        pkgs.lib.getInclude sharedLibDeps.${name}
+      }/include"
+    ]) (builtins.attrNames sharedLibDeps)
+  );
 }