Skip to content

Commit f4f51d4

Browse files
legendecasaduh95
andcommitted
build: ignore built-in temporal when building with shared lib
Co-Authored-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent b35af0c commit f4f51d4

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

.github/workflows/test-shared.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- deps/openssl/*/**
2121
- deps/simdjson/**
2222
- deps/sqlite/**
23+
- deps/temporal/**
2324
- deps/uv/**
2425
- deps/uvwasi/**
2526
- deps/zlib/**
@@ -51,6 +52,7 @@ on:
5152
- deps/openssl/*/**
5253
- deps/simdjson/**
5354
- deps/sqlite/**
55+
- deps/temporal/**
5456
- deps/uv/**
5557
- deps/uvwasi/**
5658
- deps/zlib/**

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
12331233
find $(TARNAME)/deps/openssl -mindepth 1 -maxdepth 1 -type d -exec $(RM) -r {} +
12341234
$(RM) -r $(TARNAME)/deps/simdjson
12351235
$(RM) -r $(TARNAME)/deps/sqlite
1236+
$(RM) -r $(TARNAME)/deps/temporal
12361237
$(RM) -r $(TARNAME)/deps/uv
12371238
$(RM) -r $(TARNAME)/deps/uvwasi
12381239
$(RM) -r $(TARNAME)/deps/zlib

shell.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ pkgs.mkShell {
3232
ccache
3333
]
3434
++ devTools
35-
++ benchmarkTools;
35+
++ benchmarkTools
36+
++ pkgs.lib.optionals (withTemporal && !builtins.hasAttr "temporal_capi" sharedLibDeps) [
37+
pkgs.cargo
38+
pkgs.rustc
39+
];
3640

3741
shellHook =
3842
if (ccache != null) then

0 commit comments

Comments
 (0)