waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-01-27 23:27:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Makefile): Make zerokit the default RLN implementation (#1190)

Browse Source 
* chore(ci): add zerokit test

* fix(ci): typo

* fix(Makefile): RLN points to zerokit, RLNKILIC points to kilic impl

* fix(ci): remove zerokit test workflow now that zerokit is default

* fix(Makefile): zerokit in ci

* fix(Makefile): do not compile kilic by default

* test(nix): add llvm to nix shell

* test(nix): clang

* fix(nix): mkShell

* fix(nix): mkShell

* fix(nix): err

* fix(nix): add binutils to macos nix shell

* fix(nix): test with musl-tools

* fix(nix): remove musl-tools

* fix(nix): add Security module

* fix(nix): gcc for linux, clang for macos

* test(Makefile): set CC to env

* Revert "test(Makefile): set CC to env"

This reverts commit fdab95f2cd0bdef916744d793ebf7005dd1d4396.

* test(nimbus-build-system): bad gcc

* fix(nix): remove optional for linux

* Revert "test(nimbus-build-system): bad gcc"

This reverts commit c6b81f81320281765f6b0eb231a15adf28279ef0.

* fix(nix): semicolon

Co-authored-by: G <28568419+s1fr0@users.noreply.github.com>
This commit is contained in:
Aaryamann Challani 2022-10-05 11:50:24 +05:30 committed by GitHub
parent f9c05aae52
commit a0d8cadcbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -70,17 +70,13 @@ endif
# control rln code compilation # control rln code compilation
ifeq ($(RLN), true) ifeq ($(RLN), true)
NIM_PARAMS := $(NIM_PARAMS) -d:rln NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
else ifeq ($(CI), true) else ifeq ($(CI), true)
NIM_PARAMS := $(NIM_PARAMS) -d:rln NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
endif endif
# control rln code compilation ifeq ($(RLNKILIC), true)
ifeq ($(RLNZEROKIT), true) NIM_PARAMS := $(NIM_PARAMS) -d:rln
NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
#else ifeq ($(CI), true)
#NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
endif endif
# detecting the os # detecting the os
@ -175,19 +171,20 @@ endif
endif endif
rlnlib: rlnlib:
ifeq ($(RLN), true) ifeq ($(RLNKILIC), true)
cargo build --manifest-path vendor/rln/Cargo.toml
else ifeq ($(CI), true)
cargo build --manifest-path vendor/rln/Cargo.toml cargo build --manifest-path vendor/rln/Cargo.toml
# Avoid compiling the non-default implementation of RLN in CI
# else ifeq ($(CI), true)
# cargo build --manifest-path vendor/rln/Cargo.toml
endif endif
rlnzerokitlib: rlnzerokitlib:
ifeq ($(RLNZEROKIT), true) ifeq ($(RLN), true)
cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
# Enable zerokit rln in CI
else ifeq ($(CI), true)
cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
#else ifeq ($(CI), true)
# cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
endif endif
test2: | build deps installganache test2: | build deps installganache

5
shell.nix
View File

@ -11,5 +11,8 @@ pkgs.mkShell {
git # 2.37.3 git # 2.37.3
which # 2.21 which # 2.21
rustc # 1.63.0 rustc # 1.63.0
] ++ lib.optionals stdenv.isDarwin [ libiconv ]; ] ++ lib.optionals stdenv.isDarwin [
libiconv
darwin.apple_sdk.frameworks.Security
];
} }