From 9df82fc9a3e20a81d72f70d7ed2f66dc113a1bb0 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 06:46:40 -0400 Subject: [PATCH 01/19] check brew version --- .github/workflows/clp-core-build-macos.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/clp-core-build-macos.yaml b/.github/workflows/clp-core-build-macos.yaml index ebf567cdb7..97b669c9f7 100644 --- a/.github/workflows/clp-core-build-macos.yaml +++ b/.github/workflows/clp-core-build-macos.yaml @@ -57,6 +57,9 @@ jobs: fetch-depth: 0 submodules: "recursive" + - name: "Check brew version" + run: "brew --version" + # See https://github.com/actions/setup-python/issues/577 - name: "Remove preinstalled binaries which conflict with brew's installs" run: | From 38e2b9b82ed637add1ae4f052ec17102ac6f1269 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 10:20:53 -0400 Subject: [PATCH 02/19] test brew tap --- .../core/tools/scripts/lib_install/macos/install-all.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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..f1c5452b33 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -8,7 +8,14 @@ set -u brew update -formula_dir="$(mktemp -d -t "clp-dep-formulas")" +#formula_dir="$(mktemp -d -t "clp-dep-formulas")" + +tap_name="clp-dep-formulas" +formula_dir="/tmp/clp-dep-formulas" +mkdir -p "$formula_dir" +git -C "$formula_dir" init -q +brew untap "$tap_name" >/dev/null 2>&1 || true +brew tap "$tap_name" "$formula_dir" # 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 From 6db9350a5b9b0a03785f8e9dc22273b6652fa7a4 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 10:35:25 -0400 Subject: [PATCH 03/19] Update tap name --- .../core/tools/scripts/lib_install/macos/install-all.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 f1c5452b33..361d61cb55 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -10,8 +10,10 @@ brew update #formula_dir="$(mktemp -d -t "clp-dep-formulas")" -tap_name="clp-dep-formulas" -formula_dir="/tmp/clp-dep-formulas" +tap_name="y-scope/clp-dep-formulas" +tap_dir="/tmp/clp-dep-formulas" +formula_dir="$tap_dir/Formula" + mkdir -p "$formula_dir" git -C "$formula_dir" init -q brew untap "$tap_name" >/dev/null 2>&1 || true From 6e7ddf67a2d27bcf9adf40e0fd8b0220b4e8d2b3 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 10:46:39 -0400 Subject: [PATCH 04/19] Fix --- .../tools/scripts/lib_install/macos/install-all.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 361d61cb55..b39f2536fa 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -12,12 +12,12 @@ brew update tap_name="y-scope/clp-dep-formulas" tap_dir="/tmp/clp-dep-formulas" -formula_dir="$tap_dir/Formula" +formula_dir="${tap_dir}/Formula" -mkdir -p "$formula_dir" -git -C "$formula_dir" init -q -brew untap "$tap_name" >/dev/null 2>&1 || true -brew tap "$tap_name" "$formula_dir" +mkdir -p "${formula_dir}" +git -C "${tap_dir}" init -q +brew untap "${tap_name}" >/dev/null 2>&1 || true +brew tap "${tap_name}" "${tap_dir}" # 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 @@ -46,7 +46,7 @@ if ! command -v uv ; then brew install uv fi -rm -rf "$formula_dir" +rm -rf "${formula_dir}" brew install \ boost \ From 0dd06d675aa0a7c1c5c6e3f3bf3eb22bce217e22 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 10:55:12 -0400 Subject: [PATCH 05/19] Fix --- .../tools/scripts/lib_install/macos/install-all.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 b39f2536fa..5ff8de4a79 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -16,6 +16,7 @@ formula_dir="${tap_dir}/Formula" mkdir -p "${formula_dir}" git -C "${tap_dir}" init -q +git -C "${tap_dir}" commit --allow-empty -qm "init tap" brew untap "${tap_name}" >/dev/null 2>&1 || true brew tap "${tap_name}" "${tap_dir}" @@ -29,7 +30,9 @@ curl \ --show-error \ https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce\ /Formula/c/cmake.rb -brew install --formula "$cmake_formula_path" +git -C "${tap_dir}" add "Formula/cmake.rb" +git -C "${tap_dir}" commit -qm "add cmake formula" +brew install "${tap_name}/cmake" # 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" @@ -40,12 +43,15 @@ curl \ --show-error \ https://raw.githubusercontent.com/Homebrew/homebrew-core/356f8408263b6a06e8f5f83cad574773d8054e1c\ /Formula/g/go-task.rb -brew install --formula "$task_formula_path" +git -C "${tap_dir}" add "Formula/go-task.rb" +git -C "${tap_dir}" commit -qm "add go-task formula" +brew install "${tap_name}/go-task" if ! command -v uv ; then brew install uv fi +brew untap "${tap_name}" || true rm -rf "${formula_dir}" brew install \ From 7c5f47f1e93b805982f23d443e803ff79db06dad Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 11:02:51 -0400 Subject: [PATCH 06/19] Fix --- .../core/tools/scripts/lib_install/macos/install-all.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5ff8de4a79..43b61d31ce 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -17,8 +17,6 @@ formula_dir="${tap_dir}/Formula" mkdir -p "${formula_dir}" git -C "${tap_dir}" init -q git -C "${tap_dir}" commit --allow-empty -qm "init tap" -brew untap "${tap_name}" >/dev/null 2>&1 || true -brew tap "${tap_name}" "${tap_dir}" # 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 @@ -32,6 +30,8 @@ curl \ /Formula/c/cmake.rb git -C "${tap_dir}" add "Formula/cmake.rb" git -C "${tap_dir}" commit -qm "add cmake formula" +brew untap "${tap_name}" || true +brew tap "${tap_name}" "${tap_dir}" brew install "${tap_name}/cmake" # Install a version of `task` < 3.43 to avoid https://github.com/y-scope/clp/issues/872 @@ -45,6 +45,8 @@ curl \ /Formula/g/go-task.rb git -C "${tap_dir}" add "Formula/go-task.rb" git -C "${tap_dir}" commit -qm "add go-task formula" +brew untap "${tap_name}" || true +brew tap "${tap_name}" "${tap_dir}" brew install "${tap_name}/go-task" if ! command -v uv ; then From e82427d1204539822c7bb416d81d84dc004c6e33 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 11:22:45 -0400 Subject: [PATCH 07/19] Test brew version upgrade --- .github/workflows/clp-core-build-macos.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clp-core-build-macos.yaml b/.github/workflows/clp-core-build-macos.yaml index 97b669c9f7..021dfee031 100644 --- a/.github/workflows/clp-core-build-macos.yaml +++ b/.github/workflows/clp-core-build-macos.yaml @@ -58,7 +58,11 @@ jobs: submodules: "recursive" - name: "Check brew version" - run: "brew --version" + run: | + brew --version + brew update + brew upgrade brew + brew --version # See https://github.com/actions/setup-python/issues/577 - name: "Remove preinstalled binaries which conflict with brew's installs" From 5be9bf796f687001efdfcb5e45e2ce953e228f3a Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 11:53:40 -0400 Subject: [PATCH 08/19] Revert checking brew version --- .github/workflows/clp-core-build-macos.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/clp-core-build-macos.yaml b/.github/workflows/clp-core-build-macos.yaml index 021dfee031..ebf567cdb7 100644 --- a/.github/workflows/clp-core-build-macos.yaml +++ b/.github/workflows/clp-core-build-macos.yaml @@ -57,13 +57,6 @@ jobs: fetch-depth: 0 submodules: "recursive" - - name: "Check brew version" - run: | - brew --version - brew update - brew upgrade brew - brew --version - # See https://github.com/actions/setup-python/issues/577 - name: "Remove preinstalled binaries which conflict with brew's installs" run: | From 22f70b51ff20df6ac55d5233d70240aaa6db030e Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 11:54:30 -0400 Subject: [PATCH 09/19] use pipx to install cmake 3.31 --- .../scripts/lib_install/macos/install-all.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 43b61d31ce..a762d1eba5 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -20,19 +20,8 @@ git -C "${tap_dir}" commit --allow-empty -qm "init tap" # 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 -git -C "${tap_dir}" add "Formula/cmake.rb" -git -C "${tap_dir}" commit -qm "add cmake formula" -brew untap "${tap_name}" || true -brew tap "${tap_name}" "${tap_dir}" -brew install "${tap_name}/cmake" +pipx uninstall cmake +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" From f3e9a4a23247c0b186ad2168166809fe4c17f2d0 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 12:09:58 -0400 Subject: [PATCH 10/19] Use pipx to install fixed-version deps --- .../scripts/lib_install/macos/install-all.sh | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) 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 a762d1eba5..d7754733c9 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -8,42 +8,13 @@ set -u brew update -#formula_dir="$(mktemp -d -t "clp-dep-formulas")" - -tap_name="y-scope/clp-dep-formulas" -tap_dir="/tmp/clp-dep-formulas" -formula_dir="${tap_dir}/Formula" - -mkdir -p "${formula_dir}" -git -C "${tap_dir}" init -q -git -C "${tap_dir}" commit --allow-empty -qm "init tap" - # 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 -pipx uninstall cmake +brew uninstall --force cmake 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 -git -C "${tap_dir}" add "Formula/go-task.rb" -git -C "${tap_dir}" commit -qm "add go-task formula" -brew untap "${tap_name}" || true -brew tap "${tap_name}" "${tap_dir}" -brew install "${tap_name}/go-task" - -if ! command -v uv ; then - brew install uv -fi - -brew untap "${tap_name}" || true -rm -rf "${formula_dir}" +pipx install go-task-bin~=3.42 brew install \ boost \ @@ -55,6 +26,7 @@ brew install \ lz4 \ mariadb-connector-c \ msgpack-cxx \ + uv \ xz \ zstd From 8a017cfed3d462454c8d3a34ce9311f6b02e1856 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 12:20:28 -0400 Subject: [PATCH 11/19] Fixiate versions --- .../core/tools/scripts/lib_install/macos/install-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d7754733c9..7588ffd5a5 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -11,10 +11,10 @@ brew update # 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 brew uninstall --force cmake -pipx install cmake~=3.31 +pipx install cmake==3.31.7 # Install a version of `task` < 3.43 to avoid https://github.com/y-scope/clp/issues/872 -pipx install go-task-bin~=3.42 +pipx install go-task-bin==3.42.1 brew install \ boost \ From 67ac6783dbb5ee9caaed1002d4393a91ea12a16c Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 12:25:47 -0400 Subject: [PATCH 12/19] Install approx versions --- .../core/tools/scripts/lib_install/macos/install-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7588ffd5a5..f4287d12a0 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -11,10 +11,10 @@ brew update # 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 brew uninstall --force cmake -pipx install cmake==3.31.7 +pipx install cmake~=3.31 # Install a version of `task` < 3.43 to avoid https://github.com/y-scope/clp/issues/872 -pipx install go-task-bin==3.42.1 +pipx install "go-task-bin>=3.42,<3.43" brew install \ boost \ From 3410a7a86aadef4206c5acdc2b11c5a2d6a94904 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 12:54:14 -0400 Subject: [PATCH 13/19] Fix boost version to 1.87.0 --- components/core/tools/scripts/lib_install/macos/install-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4287d12a0..6d91e319ed 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -17,7 +17,7 @@ pipx install cmake~=3.31 pipx install "go-task-bin>=3.42,<3.43" brew install \ - boost \ + boost==1.87.0 \ coreutils \ gcc \ java11 \ From 772c2e2f63e57081c44ce63cbfd24b61ac2aea9d Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 13:29:14 -0400 Subject: [PATCH 14/19] Try Boost 1.85 --- components/core/tools/scripts/lib_install/macos/install-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6d91e319ed..f31f19ab31 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -17,7 +17,7 @@ pipx install cmake~=3.31 pipx install "go-task-bin>=3.42,<3.43" brew install \ - boost==1.87.0 \ + boost@1.85 \ coreutils \ gcc \ java11 \ From 25f47df724f3dec417b90c297a37ae596df06478 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 14:09:07 -0400 Subject: [PATCH 15/19] Fix Boost version to 1.89 (consistent with MacOS) and remove Boost::system links --- components/core/CMakeLists.txt | 3 ++- components/core/src/reducer/CMakeLists.txt | 1 - .../centos-stream-9/install-packages-from-source.sh | 2 +- components/core/tools/scripts/lib_install/macos/install-all.sh | 2 +- .../lib_install/manylinux_2_28/install-packages-from-source.sh | 2 +- .../lib_install/musllinux_1_2/install-packages-from-source.sh | 2 +- .../lib_install/ubuntu-jammy/install-packages-from-source.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 4f598c981b..07fbc4e4b3 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -156,7 +156,8 @@ 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) + # Boost::system is no longer a target. It is now a header-only library. + 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 f31f19ab31..f4287d12a0 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -17,7 +17,7 @@ pipx install cmake~=3.31 pipx install "go-task-bin>=3.42,<3.43" brew install \ - boost@1.85 \ + boost \ coreutils \ gcc \ java11 \ 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 From 3d7004832ea5941358c48b9a6afa334143e0448d Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 19 Aug 2025 02:39:59 +0800 Subject: [PATCH 16/19] Update components/core/CMakeLists.txt Co-authored-by: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> --- components/core/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 07fbc4e4b3..d7f1df3938 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -156,7 +156,6 @@ if(CLP_NEED_BOOST) if(CLP_USE_STATIC_LIBS) set(Boost_USE_STATIC_LIBS ON) endif() - # Boost::system is no longer a target. It is now a header-only library. find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url) if(Boost_FOUND) message(STATUS "Found Boost ${Boost_VERSION}") From 04e3a5656e668f01d07bd38d6747a78b25e0e85b Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 14:51:33 -0400 Subject: [PATCH 17/19] For all dev tools, do brew uninstall and pipx install --- .../scripts/lib_install/macos/install-all.sh | 16 +++++++++++++--- docs/src/dev-guide/contributing-linting.md | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) 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 f4287d12a0..fc20f8a4ad 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -10,12 +10,23 @@ brew update # 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 -brew uninstall --force cmake -pipx install cmake~=3.31 +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 +if command -v task ; then + brew uninstall --force task +fi pipx install "go-task-bin>=3.42,<3.43" +# Install uv +if command -v uv ; then + brew uninstall --force uv +fi +pipx install "uv>=0.8" + brew install \ boost \ coreutils \ @@ -26,7 +37,6 @@ brew install \ lz4 \ mariadb-connector-c \ msgpack-cxx \ - uv \ xz \ zstd 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 From c8e344f79afe57c79dd76bda45f98c4715f9b38f Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 15:27:35 -0400 Subject: [PATCH 18/19] Address offline review comments --- .../core/tools/scripts/lib_install/macos/install-all.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 fc20f8a4ad..89d4b155d2 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -19,13 +19,12 @@ pipx install "cmake~=3.31" if command -v task ; then brew uninstall --force task fi -pipx install "go-task-bin>=3.42,<3.43" +pipx install "go-task-bin>=3.40,<3.43" # Install uv -if command -v uv ; then - brew uninstall --force uv +if ! command -v uv ; then + pipx install "uv>=0.8" fi -pipx install "uv>=0.8" brew install \ boost \ From e23fbb3d6137baa9f87fe37ba00c659b79f624d1 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 15:30:25 -0400 Subject: [PATCH 19/19] Use correct indentation --- .../core/tools/scripts/lib_install/macos/install-all.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 89d4b155d2..06b5798e62 100755 --- a/components/core/tools/scripts/lib_install/macos/install-all.sh +++ b/components/core/tools/scripts/lib_install/macos/install-all.sh @@ -11,19 +11,19 @@ brew update # 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 if command -v cmake ; then - brew uninstall --force cmake + 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 if command -v task ; then - brew uninstall --force task + brew uninstall --force task fi pipx install "go-task-bin>=3.40,<3.43" # Install uv if ! command -v uv ; then - pipx install "uv>=0.8" + pipx install "uv>=0.8" fi brew install \