Skip to content

Commit 8dd1abb

Browse files
build(deps): Install version-constrained dev tools via pipx rather than brew formulae on macOS; Bump minimum Boost version to 1.89 (fixes #1218, #1223). (#1219)
Co-authored-by: kirkrodrigues <[email protected]>
1 parent a03936f commit 8dd1abb

File tree

8 files changed

+16
-30
lines changed

8 files changed

+16
-30
lines changed

components/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ if(CLP_NEED_BOOST)
156156
if(CLP_USE_STATIC_LIBS)
157157
set(Boost_USE_STATIC_LIBS ON)
158158
endif()
159-
find_package(Boost 1.81 REQUIRED iostreams program_options filesystem system regex url)
159+
find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url)
160160
if(Boost_FOUND)
161161
message(STATUS "Found Boost ${Boost_VERSION}")
162162
else()

components/core/src/reducer/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ if(CLP_BUILD_EXECUTABLES)
4444
target_link_libraries(reducer-server
4545
PRIVATE
4646
Boost::program_options
47-
Boost::system
4847
clp::string_utils
4948
fmt::fmt
5049
${MONGOCXX_TARGET}

components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
1010
lib_install_scripts_dir="${script_dir}/.."
1111

1212
# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
13-
"${lib_install_scripts_dir}/install-boost.sh" 1.87.0
13+
"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
1414

1515
"${lib_install_scripts_dir}/liblzma.sh" 5.8.1
1616
"${lib_install_scripts_dir}/msgpack.sh" 7.0.0

components/core/tools/scripts/lib_install/macos/install-all.sh

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,24 @@ set -u
88

99
brew update
1010

11-
formula_dir="$(mktemp -d -t "clp-dep-formulas")"
12-
1311
# Install CMake v3.31.6 as ANTLR and yaml-cpp do not yet support CMake v4+.
1412
# See also: https://github.com/y-scope/clp/issues/795
15-
cmake_formula_path="${formula_dir}/cmake.rb"
16-
curl \
17-
--fail \
18-
--location \
19-
--output "$cmake_formula_path" \
20-
--show-error \
21-
https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce\
22-
/Formula/c/cmake.rb
23-
brew install --formula "$cmake_formula_path"
13+
if command -v cmake ; then
14+
brew uninstall --force cmake
15+
fi
16+
pipx install "cmake~=3.31"
2417

2518
# Install a version of `task` < 3.43 to avoid https://github.com/y-scope/clp/issues/872
26-
task_formula_path="${formula_dir}/go-task.rb"
27-
curl \
28-
--fail \
29-
--location \
30-
--output "$task_formula_path" \
31-
--show-error \
32-
https://raw.githubusercontent.com/Homebrew/homebrew-core/356f8408263b6a06e8f5f83cad574773d8054e1c\
33-
/Formula/g/go-task.rb
34-
brew install --formula "$task_formula_path"
19+
if command -v task ; then
20+
brew uninstall --force task
21+
fi
22+
pipx install "go-task-bin>=3.40,<3.43"
3523

24+
# Install uv
3625
if ! command -v uv ; then
37-
brew install uv
26+
pipx install "uv>=0.8"
3827
fi
3928

40-
rm -rf "$formula_dir"
41-
4229
brew install \
4330
boost \
4431
coreutils \

components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
77
lib_install_scripts_dir="${script_dir}/.."
88

99
# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
10-
"${lib_install_scripts_dir}/install-boost.sh" 1.87.0
10+
"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
1111

1212
# NOTE:
1313
# 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand.

components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
77
lib_install_scripts_dir="${script_dir}/.."
88

99
# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
10-
"${lib_install_scripts_dir}/install-boost.sh" 1.87.0
10+
"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
1111

1212
# NOTE:
1313
# 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand.

components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
1010
lib_install_scripts_dir=$script_dir/..
1111

1212
# NOTE: boost must be installed first since the remaining packages depend on it
13-
"$lib_install_scripts_dir"/install-boost.sh 1.87.0
13+
"$lib_install_scripts_dir"/install-boost.sh 1.89.0
1414

1515
"$lib_install_scripts_dir"/libarchive.sh 3.5.1
1616
"$lib_install_scripts_dir"/liblzma.sh 5.8.1

docs/src/dev-guide/contributing-linting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To run the linting tools, besides commonly installed tools like `tar`, you'll ne
1818
* [Task] >= 3.40.0 and < 3.43.0
1919
* Minimum version 3.40.0 is required for [yscope-dev-utils].
2020
* We constrain the version to < 3.43.0 due to unresolved [issues][clp-issue-872].
21-
* [uv] >= 0.7.10
21+
* [uv] >= 0.8
2222

2323
## Running the linters
2424

0 commit comments

Comments
 (0)