From ad0340527c3fba4a9925ebff02ed65a93a22e4ea Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Tue, 31 Oct 2023 09:58:25 +0000 Subject: [PATCH 1/2] Update Rocksdb to v8.6.7. Convert setting of CMake variable PORTABLE to use 0/1 instead of OFF/ON. Reenable fail on warnings. --- CMakeLists.txt | 9 ++------- submodules/rocksdb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8cd2ec42..5b3d8b1d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -491,18 +491,13 @@ set(WITH_TOOLS CACHE BOOL "" FORCE) if(ENABLE_AVX2) set(PORTABLE - OFF + 0 CACHE BOOL "" FORCE) else() set(PORTABLE - ON + 1 CACHE BOOL "" FORCE) endif() -set(FAIL_ON_WARNINGS - OFF - CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc - # RocksDB v7.8.3 on Windows - # https://github.com/facebook/rocksdb/issues/11072 add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL) include_directories(cpptoml/include) diff --git a/submodules/rocksdb b/submodules/rocksdb index bf2c33518..cb7a5e02e 160000 --- a/submodules/rocksdb +++ b/submodules/rocksdb @@ -1 +1 @@ -Subproject commit bf2c335184de16a3cc1787fa97ef9f22f7114238 +Subproject commit cb7a5e02edeb883193eb5b4901d5943f58e9add9 From 3b7d58d0cda1d1d3cf1b4a55454a3cb1bec68f52 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Mon, 30 Oct 2023 11:39:17 +0000 Subject: [PATCH 2/2] Update clang for CI actions. --- ci/prepare/linux/prepare-clang.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/prepare/linux/prepare-clang.sh b/ci/prepare/linux/prepare-clang.sh index f11b7050a..16636b0b3 100755 --- a/ci/prepare/linux/prepare-clang.sh +++ b/ci/prepare/linux/prepare-clang.sh @@ -1,17 +1,15 @@ #!/bin/bash set -euo pipefail -apt-get update -qq && apt-get install -yqq \ -clang \ -lldb +CLANG_VERSION=16 -export CXX=/usr/bin/clang++ -export CC=/usr/bin/clang -update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 -update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 +# TODO: Verify integrity (at this time, the clang build is not used for any production artifacts) +curl -O https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh $CLANG_VERSION -# workaround to get a path that can be easily passed into cmake for -# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE -# see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 +update-alternatives --install /usr/bin/cc cc /usr/bin/clang-$CLANG_VERSION 100 +update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-$CLANG_VERSION 100 +update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-$CLANG_VERSION 100 +# Workaround to get a path that can be easily passed into cmake for BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE +# See https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 backtrace_file=$(find /usr/lib/gcc/ -name 'backtrace.h' | head -n 1) && test -f $backtrace_file && ln -s $backtrace_file /tmp/backtrace.h \ No newline at end of file