From 3fabdf5cf7827c1308736b2b78a6a8dc4c64ef40 Mon Sep 17 00:00:00 2001 From: Christian Zentgraf Date: Tue, 8 Oct 2024 12:56:21 -0700 Subject: [PATCH] Update FBOS to v2024.07.01 (#11104) Summary: Pull Request resolved: https://github.com/facebookincubator/velox/pull/11104 Reviewed By: kgpai Differential Revision: D63838409 Pulled By: xiaoxmeng fbshipit-source-id: 36618c60cb4cd73b50e5f23931edb5c014193a7e --- CMake/resolve_dependency_modules/README.md | 10 +++++----- CMake/resolve_dependency_modules/folly/CMakeLists.txt | 4 ++-- scripts/setup-centos9.sh | 2 +- scripts/setup-macos.sh | 2 +- scripts/setup-ubuntu.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMake/resolve_dependency_modules/README.md b/CMake/resolve_dependency_modules/README.md index ce766cb17bcd..1057236bdf51 100644 --- a/CMake/resolve_dependency_modules/README.md +++ b/CMake/resolve_dependency_modules/README.md @@ -32,11 +32,11 @@ by Velox. See details on bundling below. | re2 | 2021-04-01 | Yes | | fmt | 10.1.1 | Yes | | simdjson | 3.9.3 | Yes | -| folly | v2024.05.20.00 | Yes | -| fizz | v2024.05.20.00 | No | -| wangle | v2024.05.20.00 | No | -| mvfst | v2024.05.20.00 | No | -| fbthrift | v2024.05.20.00 | No | +| folly | v2024.07.01.00 | Yes | +| fizz | v2024.07.01.00 | No | +| wangle | v2024.07.01.00 | No | +| mvfst | v2024.07.01.00 | No | +| fbthrift | v2024.07.01.00 | No | | libstemmer | 2.2.0 | Yes | | DuckDB (testing) | 0.8.1 | Yes | | cpr (testing) | 1.10.15 | Yes | diff --git a/CMake/resolve_dependency_modules/folly/CMakeLists.txt b/CMake/resolve_dependency_modules/folly/CMakeLists.txt index df7a489384ee..dadde5339735 100644 --- a/CMake/resolve_dependency_modules/folly/CMakeLists.txt +++ b/CMake/resolve_dependency_modules/folly/CMakeLists.txt @@ -14,9 +14,9 @@ project(Folly) cmake_minimum_required(VERSION 3.14) -set(VELOX_FOLLY_BUILD_VERSION v2024.05.20.00) +set(VELOX_FOLLY_BUILD_VERSION v2024.07.01.00) set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM - f4a450e59f0b74d1b0b4e5c55ae38e820166c95d02f8a8a298e54a49a90aa057) + e78584ab7ba9a687285f2849bc0141e2422a5c808ad6ab3558c83d85975e25ed) set(VELOX_FOLLY_SOURCE_URL "https://github.com/facebook/folly/releases/download/${VELOX_FOLLY_BUILD_VERSION}/folly-${VELOX_FOLLY_BUILD_VERSION}.tar.gz" ) diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh index 2914be251f58..cb193c27c96d 100755 --- a/scripts/setup-centos9.sh +++ b/scripts/setup-centos9.sh @@ -39,7 +39,7 @@ USE_CLANG="${USE_CLANG:-false}" export INSTALL_PREFIX=${INSTALL_PREFIX:-"/usr/local"} DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download} -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.07.01.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0" diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 1f9ddfa0fda1..44f56e793fed 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -42,7 +42,7 @@ BUILD_DUCKDB="${BUILD_DUCKDB:-true}" DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} MACOS_VELOX_DEPS="bison flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 snappy xz zstd" MACOS_BUILD_DEPS="ninja cmake" -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.07.01.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" STEMMER_VERSION="2.2.0" diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 5ecf27235652..6ab4daae6b59 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -54,7 +54,7 @@ function install_clang15 { ${SUDO} apt install ${CLANG_PACKAGE_LIST} -y } -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.07.01.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0"