8000 tools: test `--shared-merve` in `test-shared` workflow · nodejs/node@c843e44 · GitHub
[go: up one dir, main page]
Skip to content

Commit c843e44

Browse files
aduh95aduh95
committed
tools: test --shared-merve in test-shared workflow
PR-URL: #61649 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 23d1ecf commit c843e44

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- deps/icu-small/**
2424
- deps/icu-tmp/**
2525
- deps/llhttp/**
26+
- deps/merve/**
2627
- deps/nbytes/**
2728
- deps/nghttp2/**
2829
- deps/ngtcp2/**
@@ -72,6 +73,7 @@ on:
7273
- deps/icu-small/**
7374
- deps/icu-tmp/**
7475
- deps/llhttp/**
76+
- deps/merve/**
7577
- deps/nbytes/**
7678
- deps/nghttp2/**
7779
- deps/ngtcp2/**

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
12411241
$(RM) -r $(TARNAME)/deps/icu-tmp
12421242
$(RM) -r $(TARNAME)/deps/LIEF
12431243
$(RM) -r $(TARNAME)/deps/llhttp
1244+
$(RM) -r $(TARNAME)/deps/merve
12441245
$(RM) -r $(TARNAME)/deps/nbytes
12451246
$(RM) -r $(TARNAME)/deps/nghttp2
12461247
$(RM) -r $(TARNAME)/deps/ngtcp2

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'node_shared_http_parser%': 'false',
2020
'node_shared_libuv%': 'false',
2121
'node_shared_lief%': 'false',
22+
'node_shared_merve%': 'false',
2223
'node_shared_nbytes%': 'false',
2324
'node_shared_nghttp2%': 'false',
2425
'node_shared_openssl%': 'false',

‎tools/nix/sharedLibDeps.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
hash = "sha256-8cbu4ftn5ke7vd4cniwxuyKl6FRxwdToBj77oyYmsfk=";
3333
}
3434
}/pkgs/by-name/nb/nbytes/package.nix" { };
35+
merve = pkgs.callPackage (builtins.fetchurl {
36+
url = "https://github.com/NixOS/nixpkgs/raw/469b8e35e54d2880d73337c5ef2f1416b9b1dd43/pkgs/by-name/me/merve/package.nix";
37+
sha256 = "0r2fmip48hcy4za6xfaml627x9m4218g6vlk5fiajmypfvxybzfy";
38+
}) { };
3539
}
3640
// (pkgs.lib.optionalAttrs withLief {
3741
lief = pkgs.callPackage (builtins.fetchurl {

0 commit comments

Comments
 (0)
0