Skip to content

Commit

Permalink
Merge pull request #418 from unum-cloud/release-pre-release-correctio…
Browse files Browse the repository at this point in the history
…ns-builds-tests-warnings-docs

Release pre release corrections builds tests warnings docs
  • Loading branch information
ashvardanian authored Aug 11, 2023
2 parents 658ed12 + 558244a commit c13c3bf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit c13c3bf

Please sign in to comment.