Skip to content

Commit 78175c6

Browse files
aduh95aduh95
committed
tools: improve nix-changes coverage
Signed-off-by: Antoine du Hamel <[email protected]> PR-URL: #65403 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Filip Skokan <[email protected]>
1 parent 6f0c08b commit 78175c6

7 files changed

Lines changed: 81 additions & 30 deletions

File tree

‎.github/workflows/build-tarball.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- tools/eslint-rules/**
2424
- tools/eslint/**
2525
- tools/lint-md/**
26+
- tools/nix/**
2627
- typings/**
2728
- vcbuild.bat
2829
- .**
@@ -52,6 +53,7 @@ on:
5253
- tools/eslint-rules/**
5354
- tools/eslint/**
5455
- tools/lint-md/**
56+
- tools/nix/**
5557
- typings/**
5658
- vcbuild.bat
5759
- .**

‎.github/workflows/coverage-windows.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- tools/eslint-rules/**
2424
- tools/eslint/**
2525
- tools/lint-md/**
26+
- tools/nix/**
2627
- typings/**
2728
- .**
2829
- '!.github/workflows/coverage-windows.yml'
@@ -49,6 +50,7 @@ on:
4950
- tools/eslint-rules/**
5051
- tools/eslint/**
5152
- tools/lint-md/**
53+
- tools/nix/**
5254
- typings/**
5355
- .**
5456
- '!.github/workflows/coverage-windows.yml'

‎.github/workflows/nix-changes.yml‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ on:
1111
- v[0-9]+.x
1212
paths:
1313
- '**.nix'
14+
- tools/nix/**
1415
- .github/workflows/nix-changes.yml
1516
pull_request:
1617
paths:
1718
- '**.nix'
19+
- tools/nix/**
1820
- .github/workflows/nix-changes.yml
1921
types: [opened, synchronize, reopened, ready_for_review]
2022

@@ -47,7 +49,9 @@ jobs:
4749
with:
4850
fetch-depth: 2
4951
persist-credentials: false
50-
sparse-checkout: '*.nix'
52+
sparse-checkout: |
53+
shell.nix
54+
tools/nix/
5155
sparse-checkout-cone-mode: false
5256

5357
- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
@@ -60,39 +64,14 @@ jobs:
6064
name: nodejs
6165

6266
- name: Compute requisites after change
63-
shell: bash # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option.
64-
run: |
65-
nix-store --query --references "$(
66-
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
67-
--arg devTools "
68-
(import ./tools/nix/devTools.nix {})
69-
++ builtins.attrValues (
70-
{ inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
71-
// import ./tools/nix/openssl-matrix.nix {}
72-
// import ./tools/nix/pkcs11.nix {}
73-
)")" \
74-
| xargs nix-store --realise \
75-
| xargs nix-store --query --requisites \
76-
| sort -k1.45 \
77-
> requisites-${{ matrix.system }}-after.list
67+
run: ./tools/nix/list-requisites.sh > requisites-${{ matrix.system }}-after.list
7868

7969
- name: Compute requisites before change
80-
shell: bash # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option.
8170
run: |
8271
git reset HEAD^ --hard
83-
nix-store --query --references "$(
84-
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
85-
--arg devTools "
86-
(import ./tools/nix/devTools.nix {})
87-
++ builtins.attrValues (
88-
{ inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
89-
// import ./tools/nix/openssl-matrix.nix {}
90-
// import ./tools/nix/pkcs11.nix {}
91-
)")" \
92-
| xargs nix-store --realise \
93-
| xargs nix-store --query --requisites \
94-
| sort -k1.45 \
95-
> requisites-${{ matrix.system }}-before.list
72+
# TODO(aduh95): remove this once list-requisites.sh has reached `main`
73+
[ -f tools/nix/list-requisites.sh ] || git checkout FETCH_HEAD -- tools/nix/list-requisites.sh
74+
./tools/nix/list-requisites.sh > requisites-${{ matrix.system }}-before.list
9675
9776
- name: Output diff
9877
run: |

‎.github/workflows/test-linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- tools/actions/**
1010
- tools/clang-format/**
1111
- tools/dep_updaters/**
12+
- tools/nix/**
1213
- test/internet/**
1314
- '**.nix'
1415
- .github/**
@@ -27,6 +28,7 @@ on:
2728
- tools/actions/**
2829
- tools/clang-format/**
2930
- tools/dep_updaters/**
31+
- tools/nix/**
3032
- test/internet/**
3133
- '**.nix'
3234
- .github/**

‎.github/workflows/test-macos.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- tools/eslint-rules/**
2424
- tools/eslint/**
2525
- tools/lint-md/**
26+
- tools/nix/**
2627
- typings/**
2728
- vcbuild.bat
2829
- .**
@@ -53,6 +54,7 @@ on:
5354
- tools/eslint-rules/**
5455
- tools/eslint/**
5556
- tools/lint-md/**
57+
- tools/nix/**
5658
- typings/**
5759
- vcbuild.bat
5860
- .**

‎.github/workflows/test-shared.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ on:
4444
- '!tools/nix/**'
4545
- '!tools/v8/**'
4646
- '!tools/v8_gypfiles/**'
47+
- tools/nix/list-requisites.sh
4748
- typings/**
4849
- vcbuild.bat
4950
- .**
@@ -96,6 +97,7 @@ on:
9697
- '!tools/nix/**'
9798
- '!tools/v8/**'
9899
- '!tools/v8_gypfiles/**'
100+
- tools/nix/list-requisites.sh
99101
- typings/**
100102
- vcbuild.bat
101103
- .**

‎tools/nix/list-requisites.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/bin/sh
2+
3+
set -ex
4+
5+
BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
6+
7+
OPTIONAL_FLAGS=$(nix-instantiate -I "nixpkgs=$BASE_DIR/tools/nix/pkgs.nix" --eval --strict --raw -E "
8+
(import <nixpkgs> {}).lib.concatMapStrings
9+
(n: ''--arg \${n} true '')
10+
(builtins.filter
11+
(n: builtins.match ''with[A-Z].+'' n != null)
12+
(builtins.attrNames (builtins.functionArgs (import $BASE_DIR/shell.nix))))
13+
"
14+
)
15+
16+
DRV=$(
17+
cd "$BASE_DIR"
18+
# shellcheck disable=SC2086
19+
nix-instantiate -I "nixpkgs=./tools/nix/pkgs.nix" shell.nix \
20+
$OPTIONAL_FLAGS \
21+
--arg sharedLibDeps '{
22+
# Using an empty set as some build dependencies are required only in the absence of shared deps (e.g. Cargo).
23+
# We pass the shared deps as devTools below so they are still accounted for.
24+
}' \
25+
--arg pkcs11 'import ./tools/nix/pkcs11.nix {
26+
# Passing an import call rather than "true" to workaround sharedLibDeps being empty.
27+
}' \
28+
--arg devTools '
29+
let
30+
pkgs = import <nixpkgs> { };
31+
sharedLibDepsFn = import ./tools/nix/sharedLibDeps.nix;
32+
in
33+
(import ./tools/nix/devTools.nix { })
34+
++ pkgs.lib.flatten (
35+
with (pkgs.callPackage ./tools/nix/v8.nix { });
36+
[
37+
# We do not want to build V8 here, but still want to list its requisites.
38+
buildInputs
39+
nativeBuildInputs
40+
propagatedBuildInputs
41+
propagatedNativeBuildInputs
42+
(pkgs.callPackage ./tools/nix/non-v8-deps-mock.nix { })
43+
]
44+
)
45+
++ builtins.attrValues (
46+
{
47+
# Additional packages we are using across the codebase
48+
inherit (pkgs) nixfmt-tree sccache;
49+
}
50+
// import ./tools/nix/openssl-matrix.nix { }
51+
// sharedLibDepsFn (
52+
pkgs.lib.filterAttrs (n: v: builtins.match "with[A-Z].+" n != null) (
53+
builtins.functionArgs sharedLibDepsFn
54+
)
55+
)
56+
)'
57+
)
58+
REFS=$(nix-store --query --references "$DRV")
59+
STORE_PATHS=$(echo "$REFS" | xargs nix-store --realise)
60+
REQUISITES=$(echo "$STORE_PATHS" | xargs nix-store --query --requisites)
61+
62+
echo "$REQUISITES" | sort -k1.45 | uniq

0 commit comments

Comments
 (0)