github/tfhe-rs
1
1
Fork 0
mirror of https://github.com/zama-ai/tfhe-rs.git synced 2026-01-09 22:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(ci): set node version

Browse Source
This commit is contained in:
tmontaigu
2023-10-19 18:10:52 +02:00
parent be9a4d2d9c
commit 0085ceb97b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -16,6 +16,7 @@ PARSE_INTEGER_BENCH_CSV_FILE?=tfhe_rs_integer_benches.csv
FAST_TESTS?=FALSE FAST_TESTS?=FALSE
FAST_BENCH?=FALSE FAST_BENCH?=FALSE
BENCH_OP_FLAVOR?=DEFAULT BENCH_OP_FLAVOR?=DEFAULT
NODE_VERSION=20
# This is done to avoid forgetting it, we still precise the RUSTFLAGS in the commands to be able to # This is done to avoid forgetting it, we still precise the RUSTFLAGS in the commands to be able to
# copy paste the command in the terminal and change them if required without forgetting the flags # copy paste the command in the terminal and change them if required without forgetting the flags
export RUSTFLAGS?=-C target-cpu=native export RUSTFLAGS?=-C target-cpu=native
@@ -99,7 +100,7 @@ install_wasm_pack: install_rs_build_toolchain
install_node: install_node:
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | $(SHELL) curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | $(SHELL)
source ~/.bashrc source ~/.bashrc
$(SHELL) -i -c 'nvm install node' || \ $(SHELL) -i -c 'nvm install $(NODE_VERSION)' || \
( echo "Unable to install node, unknown error." && exit 1 ) ( echo "Unable to install node, unknown error." && exit 1 )
.PHONY: install_dieharder # Install dieharder for apt distributions or macOS .PHONY: install_dieharder # Install dieharder for apt distributions or macOS
@@ -469,7 +470,7 @@ check_compile_tests:
.PHONY: build_nodejs_test_docker # Build a docker image with tools to run nodejs tests for wasm API .PHONY: build_nodejs_test_docker # Build a docker image with tools to run nodejs tests for wasm API
build_nodejs_test_docker: build_nodejs_test_docker:
DOCKER_BUILDKIT=1 docker build --build-arg RUST_TOOLCHAIN="$(RS_BUILD_TOOLCHAIN)" \ DOCKER_BUILDKIT=1 docker build --build-arg RUST_TOOLCHAIN="$(RS_BUILD_TOOLCHAIN)" \
-f docker/Dockerfile.wasm_tests -t tfhe-wasm-tests . -f docker/Dockerfile.wasm_tests --build-arg NODE_VERSION=$(NODE_VERSION) -t tfhe-wasm-tests .
.PHONY: test_nodejs_wasm_api_in_docker # Run tests for the nodejs on wasm API in a docker container .PHONY: test_nodejs_wasm_api_in_docker # Run tests for the nodejs on wasm API in a docker container
test_nodejs_wasm_api_in_docker: build_nodejs_test_docker test_nodejs_wasm_api_in_docker: build_nodejs_test_docker
@@ -493,8 +494,8 @@ test_web_js_api_parallel: build_web_js_api_parallel
.PHONY: ci_test_web_js_api_parallel # Run tests for the web wasm api .PHONY: ci_test_web_js_api_parallel # Run tests for the web wasm api
ci_test_web_js_api_parallel: build_web_js_api_parallel ci_test_web_js_api_parallel: build_web_js_api_parallel
source ~/.nvm/nvm.sh && \ source ~/.nvm/nvm.sh && \
nvm install 20 && \ nvm install $(NODE_VERSION) && \
nvm use 20 && \ nvm use $(NODE_VERSION) && \
$(MAKE) -C tfhe/web_wasm_parallel_tests test-ci $(MAKE) -C tfhe/web_wasm_parallel_tests test-ci
.PHONY: no_tfhe_typo # Check we did not invert the h and f in tfhe .PHONY: no_tfhe_typo # Check we did not invert the h and f in tfhe

3
docker/Dockerfile.wasm_tests
View File

@@ -11,6 +11,7 @@ RUN sed -i 's|^deb http://archive.ubuntu.com/ubuntu/|deb http://mirror.ubuntu.ik
ENV CARGO_TARGET_DIR=/root/tfhe-rs-target ENV CARGO_TARGET_DIR=/root/tfhe-rs-target
ARG RUST_TOOLCHAIN="stable" ARG RUST_TOOLCHAIN="stable"
ARG NODE_VERSION
WORKDIR /tfhe-wasm-tests WORKDIR /tfhe-wasm-tests
@@ -34,6 +35,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > install-rustup.s
chmod +x install-node.sh && \ chmod +x install-node.sh && \
./install-node.sh && \ ./install-node.sh && \
. "$HOME/.nvm/nvm.sh" && \ . "$HOME/.nvm/nvm.sh" && \
bash -i -c 'nvm install 20 && nvm use 20' bash -i -c 'nvm install ${NODE_VERSION} && nvm use ${NODE_VERSION}'
WORKDIR /tfhe-wasm-tests/tfhe-rs/ WORKDIR /tfhe-wasm-tests/tfhe-rs/