From 5a15acf4a50e3094e81dee45a98d1eb8f3d71488 Mon Sep 17 00:00:00 2001 From: Darvin Harutyunyan <12006323+DarvinHarutyunyan@users.noreply.github.com> Date: Fri, 11 Aug 2023 10:25:47 +0000 Subject: [PATCH 1/2] Fix: Undefined references to `absl` in "Build UStore" --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9f4b077..169586ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ if(${USE_CONAN}) set(LIB_ROCKSDB rocksdb) else() include_directories(${CONAN_INCLUDE_DIRS_ROCKSDB}) - set(LIB_ROCKSDB rocksdb) + set(LIB_ROCKSDB ${CONAN_LIBS_ROCKSDB}) endif() endif() @@ -333,7 +333,7 @@ if(${USE_CONAN}) # add_library(arrow::bundled STATIC IMPORTED) # set_property(TARGET arrow::bundled ${CONAN_LIBS_RE2} ${CONAN_LIBS_UTF8PROC} ${CONAN_LIBS_THRIFT} ${CONAN_LIBS_ABSEIL} ${CONAN_LIBS_SNAPPY} ${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_ZLIB} ${CONAN_LIBS_C-ARES} ${CONAN_LIBS_GRPC}) - set(LIB_ARROW_BUNDLED ${LIB_RE2} ${CONAN_LIBS_UTF8PROC} thriftz thriftnb ${LIB_THRIFT} ${CONAN_LIBS_ABSEIL} ${CONAN_LIBS_SNAPPY} ${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_ZLIB} ${CONAN_LIBS_C-ARES} ${CONAN_LIBS_GRPC}) + set(LIB_ARROW_BUNDLED ${LIB_RE2} ${CONAN_LIBS_UTF8PROC} ${CONAN_LIBS_THRIFT} ${LIB_THRIFT} ${CONAN_LIBS_ABSEIL} ${CONAN_LIBS_SNAPPY} ${CONAN_LIBS_PROTOBUF} ${CONAN_LIBS_ZLIB} ${CONAN_LIBS_C-ARES} ${CONAN_LIBS_GRPC}) # set(LIB_ARROW_BUNDLED arrow::bundled) endif() From 558244ad8a2686b9b9ed7573ddab5efa12c88a46 Mon Sep 17 00:00:00 2001 From: Darvin Harutyunyan <12006323+DarvinHarutyunyan@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:03:09 +0000 Subject: [PATCH 2/2] Fix: Environment variable USTORE_TEST_PATH in prerelease.yml --- .github/workflows/prerelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 9e661918..baaeb36b 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -145,6 +145,8 @@ jobs: - name: Build and test java run: | + mkdir -p ./tmp + export USTORE_TEST_PATH="./tmp/" sed -i 's/make -j/make -j4/' /home/runner/work/ustore/ustore/java/pack.sh export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64" bash /home/runner/work/ustore/ustore/java/pack.sh \ No newline at end of file