Skip to content

Commit

Permalink
fix(backward): fix backward data clone script with multiple branches
Browse files Browse the repository at this point in the history
  • Loading branch information
nsarlin-zama committed Sep 11, 2024
1 parent 199fb58 commit d7f9f46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ test_versionable: install_rs_build_toolchain
test_backward_compatibility_ci: install_rs_build_toolchain
TFHE_BACKWARD_COMPAT_DATA_DIR="$(BACKWARD_COMPAT_DATA_DIR)" RUSTFLAGS="$(RUSTFLAGS)" cargo $(CARGO_RS_BUILD_TOOLCHAIN) test --profile $(CARGO_PROFILE) \
--config "patch.'$(BACKWARD_COMPAT_DATA_URL)'.$(BACKWARD_COMPAT_DATA_PROJECT).path=\"tfhe/$(BACKWARD_COMPAT_DATA_DIR)\"" \
--features=$(TARGET_ARCH_FEATURE),shortint,integer -p $(TFHE_SPEC) test_backward_compatibility -- --nocapture
--features=$(TARGET_ARCH_FEATURE),shortint,integer,zk-pok -p $(TFHE_SPEC) test_backward_compatibility -- --nocapture

.PHONY: test_backward_compatibility # Same as test_backward_compatibility_ci but tries to clone the data repo first if needed
test_backward_compatibility: tfhe/$(BACKWARD_COMPAT_DATA_DIR) test_backward_compatibility_ci
Expand Down
2 changes: 1 addition & 1 deletion scripts/clone_backward_compat_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if ! git lfs env 2>/dev/null >/dev/null; then
fi

if [ -d $3 ]; then
cd $3 && git fetch --depth 1 && git reset --hard origin/$2 && git clean -dfx
cd $3 && git remote set-branches origin '*' && git fetch --depth 1 && git reset --hard origin/$2 && git clean -dfx

else
git clone $1 -b $2 --depth 1 $3
Expand Down

0 comments on commit d7f9f46

Please sign in to comment.