diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 4f598c981b..d7f1df3938 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -156,7 +156,7 @@ if(CLP_NEED_BOOST) if(CLP_USE_STATIC_LIBS) set(Boost_USE_STATIC_LIBS ON) endif() - find_package(Boost 1.81 REQUIRED iostreams program_options filesystem system regex url) + find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url) if(Boost_FOUND) message(STATUS "Found Boost ${Boost_VERSION}") else() diff --git a/components/core/src/reducer/CMakeLists.txt b/components/core/src/reducer/CMakeLists.txt index ec830624b8..c4818166d4 100644 --- a/components/core/src/reducer/CMakeLists.txt +++ b/components/core/src/reducer/CMakeLists.txt @@ -44,7 +44,6 @@ if(CLP_BUILD_EXECUTABLES) target_link_libraries(reducer-server PRIVATE Boost::program_options - Boost::system clp::string_utils fmt::fmt ${MONGOCXX_TARGET} diff --git a/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh index a280f79e79..4757c5c7b6 100755 --- a/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh +++ b/components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" lib_install_scripts_dir="${script_dir}/.." # NOTE: The remaining installation scripts depend on boost, so we install it beforehand. -"${lib_install_scripts_dir}/install-boost.sh" 1.87.0 +"${lib_install_scripts_dir}/install-boost.sh" 1.89.0 "${lib_install_scripts_dir}/liblzma.sh" 5.8.1 "${lib_install_scripts_dir}/msgpack.sh" 7.0.0 diff --git a/components/core/tools/scripts/lib_install/macos/install-all.sh b/components/core/tools/scripts/lib_install/macos/install-all.sh index 4f75fb8af4..06b5798e62 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -8,37 +8,24 @@ set -u brew update -formula_dir="$(mktemp -d -t "clp-dep-formulas")" - # Install CMake v3.31.6 as ANTLR and yaml-cpp do not yet support CMake v4+. # See also: https://github.com/y-scope/clp/issues/795 -cmake_formula_path="${formula_dir}/cmake.rb" -curl \ - --fail \ - --location \ - --output "$cmake_formula_path" \ - --show-error \ - https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce\ -/Formula/c/cmake.rb -brew install --formula "$cmake_formula_path" +if command -v cmake ; then + brew uninstall --force cmake +fi +pipx install "cmake~=3.31" # Install a version of `task` < 3.43 to avoid https://github.com/y-scope/clp/issues/872 -task_formula_path="${formula_dir}/go-task.rb" -curl \ - --fail \ - --location \ - --output "$task_formula_path" \ - --show-error \ - https://raw.githubusercontent.com/Homebrew/homebrew-core/356f8408263b6a06e8f5f83cad574773d8054e1c\ -/Formula/g/go-task.rb -brew install --formula "$task_formula_path" +if command -v task ; then + brew uninstall --force task +fi +pipx install "go-task-bin>=3.40,<3.43" +# Install uv if ! command -v uv ; then - brew install uv + pipx install "uv>=0.8" fi -rm -rf "$formula_dir" - brew install \ boost \ coreutils \ diff --git a/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh index d31343c8ee..8cb33f4f4b 100755 --- a/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh +++ b/components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh @@ -7,7 +7,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" lib_install_scripts_dir="${script_dir}/.." # NOTE: The remaining installation scripts depend on boost, so we install it beforehand. -"${lib_install_scripts_dir}/install-boost.sh" 1.87.0 +"${lib_install_scripts_dir}/install-boost.sh" 1.89.0 # NOTE: # 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand. diff --git a/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh index e1f65b9bcd..bf1575284c 100755 --- a/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh +++ b/components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh @@ -7,7 +7,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" lib_install_scripts_dir="${script_dir}/.." # NOTE: The remaining installation scripts depend on boost, so we install it beforehand. -"${lib_install_scripts_dir}/install-boost.sh" 1.87.0 +"${lib_install_scripts_dir}/install-boost.sh" 1.89.0 # NOTE: # 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand. diff --git a/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh index 161058ae9f..f8dfc74465 100755 --- a/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh +++ b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" lib_install_scripts_dir=$script_dir/.. # NOTE: boost must be installed first since the remaining packages depend on it -"$lib_install_scripts_dir"/install-boost.sh 1.87.0 +"$lib_install_scripts_dir"/install-boost.sh 1.89.0 "$lib_install_scripts_dir"/libarchive.sh 3.5.1 "$lib_install_scripts_dir"/liblzma.sh 5.8.1 diff --git a/docs/src/dev-guide/contributing-linting.md b/docs/src/dev-guide/contributing-linting.md index fd92a2da91..84264b098b 100644 --- a/docs/src/dev-guide/contributing-linting.md +++ b/docs/src/dev-guide/contributing-linting.md @@ -18,7 +18,7 @@ To run the linting tools, besides commonly installed tools like `tar`, you'll ne * [Task] >= 3.40.0 and < 3.43.0 * Minimum version 3.40.0 is required for [yscope-dev-utils]. * We constrain the version to < 3.43.0 due to unresolved [issues][clp-issue-872]. -* [uv] >= 0.7.10 +* [uv] >= 0.8 ## Running the linters