Skip to content

Commit

Permalink
upgrade fbos dependencies to v2024.04.01.00 (from v2024.02.26.00) (#9372
Browse files Browse the repository at this point in the history
)

Summary: Pull Request resolved: #9372

Reviewed By: xiaoxmeng

Differential Revision: D55803918

Pulled By: pedroerp

fbshipit-source-id: 78255e2fad624c1633c5b6c773a179f5f2be1689
  • Loading branch information
czentgr authored and facebook-github-bot committed Apr 5, 2024
1 parent 2c1c7d0 commit 5fed974
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions CMake/resolve_dependency_modules/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Following is the list of libraries and their minimum version
that Velox requires. Some of these libraries can be installed
via a platform's package manager (eg. `brew` on MacOS).
The versions of certain libraries is the default provided by
The versions of certain libraries is the default provided by
the platform's package manager. Some libraries can be bundled
by Velox. See details on bundling below.

| Library Name | Minimum Version | Bundled? |
| Library Name | Minimum Version | Bundled? |
|-------------------|-----------------|----------|
| ninja | default | No |
| ccache | default | No |
Expand All @@ -16,7 +16,7 @@ by Velox. See details on bundling below.
| gtest (testing) | default | Yes |
| libevent | default | No |
| libsodium | default | No |
| lz4 | default | No |
| lz4 | default | No |
| snappy | default | No |
| lzo | default | No |
| xz | default | No |
Expand All @@ -32,11 +32,11 @@ by Velox. See details on bundling below.
| re2 | 2021-04-01 | Yes |
| fmt | 10.1.1 | Yes |
| simdjson | 3.2.0 | Yes |
| folly | v2024.02.26.00 | Yes |
| fizz | v2024.02.26.00 | No |
| wangle | v2024.02.26.00 | No |
| mvfst | v2024.02.26.00 | No |
| fbthrift | v2024.02.26.00 | No |
| folly | v2024.04.01.00 | Yes |
| fizz | v2024.04.01.00 | No |
| wangle | v2024.04.01.00 | No |
| mvfst | v2024.04.01.00 | No |
| fbthrift | v2024.04.01.00 | No |
| DuckDB (testing) | 0.8.1 | Yes |
| cpr (testing) | 1.10.15 | Yes |

Expand Down
4 changes: 2 additions & 2 deletions CMake/resolve_dependency_modules/folly/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
project(Folly)
cmake_minimum_required(VERSION 3.14)

set(VELOX_FOLLY_BUILD_VERSION v2024.02.26.00)
set(VELOX_FOLLY_BUILD_VERSION v2024.04.01.00)
set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM
0a5570be503e377f2a9c178b926cd350ae72bddaeb0c7164a1fac7118c00e866)
e0c8386eea1a317ff17f1edc36c29362db94aeca8689659f1c530ea777779409)
set(VELOX_FOLLY_SOURCE_URL
"https://github.com/facebook/folly/releases/download/${VELOX_FOLLY_BUILD_VERSION}/folly-${VELOX_FOLLY_BUILD_VERSION}.tar.gz"
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-centos8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function install_protobuf {
)
}

FB_OS_VERSION="v2024.02.26.00"
FB_OS_VERSION="v2024.04.01.00"

function install_fizz {
wget_and_untar https://github.com/facebookincubator/fizz/archive/refs/tags/${FB_OS_VERSION}.tar.gz fizz
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ NPROC=$(getconf _NPROCESSORS_ONLN)
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium"
MACOS_BUILD_DEPS="ninja cmake ccache"
FB_OS_VERSION="v2024.02.26.00"
FB_OS_VERSION="v2024.04.01.00"

function update_brew {
DEFAULT_BREW_PATH=/usr/local/bin/brew
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ source $SCRIPTDIR/setup-helper-functions.sh
CPU_TARGET="${CPU_TARGET:-avx}"
COMPILER_FLAGS=$(get_cxx_flags "$CPU_TARGET")
export COMPILER_FLAGS
FB_OS_VERSION=v2024.02.26.00
FB_OS_VERSION=v2024.04.01.00
FMT_VERSION=10.1.1
BOOST_VERSION=boost-1.84.0
NPROC=$(getconf _NPROCESSORS_ONLN)
Expand Down Expand Up @@ -135,7 +135,7 @@ function install_conda {
echo "Unsupported architecture: $ARCH"
exit 1
fi

mkdir -p conda && cd conda
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-$ARCH.sh
bash Miniconda3-latest-Linux-$ARCH.sh -b -p $MINICONDA_PATH
Expand Down

0 comments on commit 5fed974

Please sign in to comment.