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

aduh95 · aduh95 · commit e7023eb50d1a · 2025-09-09T18:40:15.000+02:00
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -123,9 +123,9 @@ jobs:
           persist-credentials: false
           sparse-checkout: '*.nix'
           sparse-checkout-cone-mode: false
-      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31.6.1
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487  # v31.6.1
       - name: Lint Nix files
-        run: nix-shell -I nixpkgs=./nixpkgs.nix -p 'nixfmt-tree' --run 'treefmt --quiet --fail-on-change'       
+        run: nix-shell -I nixpkgs=./nixpkgs.nix -p 'nixfmt-tree' --run 'treefmt --quiet --fail-on-change'
       - if: ${{ failure() }}
         name: Show diff
         run: git --no-pager diff
diff --git a/.github/workflows/test-shared.yml b/.github/workflows/test-shared.yml
@@ -27,15 +27,15 @@ on:
     inputs:
       repo:
         type: string
-        description: 'GitHub repository to fetch from (default to the current repo)'
+        description: GitHub repository to fetch from (default to the current repo)
       pr_id:
         type: number
         required: true
-        description: 'The PR to test'
+        description: The PR to test
       commit:
         required: true
         type: string
-        description: 'The expect HEAD of the PR'
+        description: The expect HEAD of the PR
       category:
         required: true
         type: string
@@ -88,7 +88,6 @@ jobs:
         env:
           DISTTYPE: nightly
 
-
       - name: Upload tarball artifact
         if: ${{ github.event_name != 'workflow_dispatch' }}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
@@ -126,7 +125,7 @@ jobs:
           tar xzf tarballs/*.tar.gz -C "$RUNNER_TEMP"
           echo "TAR_DIR=$RUNNER_TEMP/$(basename tarballs/*.tar.gz .tar.gz)" >> "$GITHUB_ENV"
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         if: ${{ github.event_name == 'workflow_dispatch' }}
         with:
           repository: ${{ inputs.repo || github.repository }}
@@ -142,25 +141,25 @@ jobs:
         env:
           EXPECTED_SHA: ${{ inputs.commit }}
 
-      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31.6.1
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487  # v31.6.1
         with:
           extra_nix_config: sandbox = true
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad  # v16
         with:
           name: nodejs
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - name: Configure sccache
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea  # v7.0.1
         with:
           script: |
             core.exportVariable('SCCACHE_GHA_VERSION', 'on');
             core.exportVariable('ACTIONS_CACHE_SERVICE_V2', 'on');
             core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-      
+
       - name: Load shell.nix
         run: |
           ${{ github.event_name == 'workflow_dispatch' &&
@@ -171,6 +170,7 @@ jobs:
       - name: Build Node.js ${{ github.event_name == 'workflow_dispatch' && 'on the base commit' || 'and run tests' }}
         run: |
           nix-shell \
+              -I nixpkgs=./nixpkgs.nix \
             --pure --keep TAR_DIR --keep FLAKY_TESTS \
             --keep SCCACHE_GHA_VERSION --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
             --arg loadJSBuiltinsDynamically false \
@@ -188,6 +188,7 @@ jobs:
           mv out/Release/node base_node
           git reset FETCH_HEAD --hard
           nix-shell \
+            -I nixpkgs=./nixpkgs.nix \
             --pure \
             --arg loadJSBuiltinsDynamically false \
             --arg ccache 'null' \
@@ -201,6 +202,7 @@ jobs:
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
           nix-shell \
+            -I nixpkgs=./nixpkgs.nix \
             --pure --keep FILTER \
             --arg loadJSBuiltinsDynamically false \
             --arg ccache 'null' \
@@ -235,34 +237,35 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           persist-credentials: false
           sparse-checkout: |
             benchmark/*.R
-            shell.nix
+            *.nix
           sparse-checkout-cone-mode: false
 
       - name: Download benchmark raw results
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0  # v5.0.0
         with:
           pattern: csv-*
-          merge-multiple: true 
+          merge-multiple: true
           path: raw-results
 
-      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31.6.1
+      - uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487  # v31.6.1
         with:
           extra_nix_config: sandbox = true
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad  # v16
         with:
           name: nodejs
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - name: Benchmark results
         run: |
           nix-shell \
+            -I nixpkgs=./nixpkgs.nix \
             --pure \
             --arg loadJSBuiltinsDynamically false \
             --arg ccache 'null' \
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -308,7 +308,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Set up Nix
         if: matrix.id == 'nixpkgs-unstable' && (github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id)
-        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487 # v31.6.1
+        uses: cachix/install-nix-action@7be5dee1421f63d07e71ce6e0a9f8a4b07c2a487  # v31.6.1
       - run: ${{ matrix.run }}
         if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id
         env:
diff --git a/BUILDING.md b/BUILDING.md
@@ -273,7 +273,7 @@ make build-ci -j12
 The use of `make build-ci` is to ensure you are using the `CONFIG_FLAGS`
 environment variable. You can also specify it manually:
 
-```sh
+```bash
 ./configure $CONFIG_FLAGS
 make -j12
 ```
diff --git a/nixpkgs.nix b/nixpkgs.nix
@@ -7,4 +7,4 @@ let
     sha256 = "1airrw6l87iyny1a3mb29l28na4s4llifprlgpll2na461jd40iy";
   }) arg;
 in
-  nixpkgs
+nixpkgs
diff --git a/shell.nix b/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)
+  );
 }

-Original file line number
+Diff line change
     sha256 = "1airrw6l87iyny1a3mb29l28na4s4llifprlgpll2na461jd40iy";
   }) arg;
 in
 -  nixpkgs
 +nixpkgs