Skip to content

build(deps-dev): Use pipx to install version-constrained build tools; Bump minimum CMake version to 3.23 to support the latest ystdlib-cpp. #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 84 commits into from
Sep 11, 2025
Merged

build(deps-dev): Use pipx to install version-constrained build tools; Bump minimum CMake version to 3.23 to support the latest ystdlib-cpp. #1271

Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
acc4a62
Add manylinux deps image build
Bill-hbrhbr Aug 24, 2025
f1c7024
Merge branch 'y-scope:main' into add-manylinux-musllinux-deps-img
Bill-hbrhbr Aug 24, 2025
81d6799
Small fix
Bill-hbrhbr Aug 24, 2025
bdb75bb
Create filter outputs
Bill-hbrhbr Aug 24, 2025
373d43f
Update docker dir
Bill-hbrhbr Aug 24, 2025
7f8706e
Fix cmake version
Bill-hbrhbr Aug 25, 2025
b5da810
Merge branch 'main' into add-manylinux-musllinux-deps-img
Bill-hbrhbr Aug 25, 2025
39d7abb
Add remaining workflows
Bill-hbrhbr Aug 25, 2025
916a4b6
Remove unrelated changes
Bill-hbrhbr Aug 25, 2025
06a9020
Update docs
Bill-hbrhbr Aug 25, 2025
0157ac4
Merge branch 'main' into add-manylinux-musllinux-deps-img
jackluo923 Aug 25, 2025
b6f1436
Add manylinux arm64 deps img workflow
Bill-hbrhbr Aug 25, 2025
93bee22
Add both x86_64 and arm64 versions for two platforms
Bill-hbrhbr Aug 25, 2025
22cfccc
fox
Bill-hbrhbr Aug 25, 2025
8adc4e6
use matrix
Bill-hbrhbr Aug 25, 2025
ff98538
Update vars
Bill-hbrhbr Aug 25, 2025
bff7064
Fix grammar
Bill-hbrhbr Aug 25, 2025
6224601
revert optimizations
Bill-hbrhbr Aug 25, 2025
828e634
Fix image prefixes with arch type
Bill-hbrhbr Aug 25, 2025
386e5dc
Alphabeticize
Bill-hbrhbr Aug 25, 2025
6f5579b
Remove doc updates since manylinux and musllinux are not common OS pl…
Bill-hbrhbr Aug 25, 2025
b674025
Merge branch 'main' into add-manylinux-musllinux-deps-img
Bill-hbrhbr Aug 26, 2025
bc976fe
Add docs and remove aarch64 builds
Bill-hbrhbr Aug 26, 2025
8d463fd
cleanup version changes
Bill-hbrhbr Aug 26, 2025
d68ddba
Apply suggestions from code review
Bill-hbrhbr Aug 27, 2025
06d2ca8
Merge branch 'main' into add-manylinux-musllinux-deps-img
Bill-hbrhbr Aug 27, 2025
d3b9b24
Install cmake 3.23
Bill-hbrhbr Aug 28, 2025
cee4c35
Merge branch 'main' into pipx-install
Bill-hbrhbr Aug 28, 2025
e6043ad
switch task and uv to pipx install too
Bill-hbrhbr Aug 28, 2025
2e2e9c8
Typo fix
Bill-hbrhbr Aug 28, 2025
4141831
Allow pipx uninstall not found
Bill-hbrhbr Aug 28, 2025
fc2fd9a
add lib version checks
Bill-hbrhbr Aug 29, 2025
096d21c
Merge branch 'main' into pipx-install
Bill-hbrhbr Aug 29, 2025
54e18e0
reorder dir structure
Bill-hbrhbr Aug 29, 2025
856c06f
Move PIPX path setup to dockerfile
Bill-hbrhbr Aug 29, 2025
e0950c1
Improve docs
Bill-hbrhbr Aug 29, 2025
b833729
lint cmake
Bill-hbrhbr Aug 29, 2025
778fdac
lock to cmake 3.23 instead of 3.31
Bill-hbrhbr Aug 29, 2025
26a3a10
Update docs
Bill-hbrhbr Aug 29, 2025
8fec8ba
Address coderabbitai review
Bill-hbrhbr Aug 29, 2025
bbf21fc
Fix comment
Bill-hbrhbr Aug 31, 2025
8601b81
change deps core to sequential
Bill-hbrhbr Aug 31, 2025
330c0ae
Bump to 4.1.1
Bill-hbrhbr Aug 31, 2025
a09f934
change deps core to sequential
Bill-hbrhbr Aug 31, 2025
0e94674
remove using simdjson
Bill-hbrhbr Sep 1, 2025
5c49e2b
resolve simdjson issues
Bill-hbrhbr Sep 1, 2025
627d024
switch back to parallel deps core
Bill-hbrhbr Sep 1, 2025
a5930d6
move brew uninstall macos into github actions
Bill-hbrhbr Sep 1, 2025
ec611c5
Merge branch 'bump-mongocxx' into pipx-install
Bill-hbrhbr Sep 1, 2025
e7a42bc
Update .github/workflows/clp-core-build-macos.yaml
Bill-hbrhbr Sep 1, 2025
58b8688
minor fix
Bill-hbrhbr Sep 1, 2025
c359e30
Refactor to ask user to uninstall manually and fail-fast for build to…
Bill-hbrhbr Sep 1, 2025
0730260
Add missing vars
Bill-hbrhbr Sep 1, 2025
f4a2c53
Add missing exit flags
Bill-hbrhbr Sep 1, 2025
627d440
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 1, 2025
b686138
Add missing line
Bill-hbrhbr Sep 1, 2025
92d6cd9
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 3, 2025
fc783cd
rewrite set euo pipefail
Bill-hbrhbr Sep 3, 2025
e29b90c
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 3, 2025
8c94fbd
Update cmake version check
Bill-hbrhbr Sep 4, 2025
0c5dce1
docs: Refer to issues redirectly.
kirkrodrigues Sep 5, 2025
d928f5e
Refactor workflow.
kirkrodrigues Sep 8, 2025
f8bde46
Only uninstall preinstalled packages that are actually installed.
kirkrodrigues Sep 8, 2025
132c3b5
Refactor comment about installing pipx packages.
kirkrodrigues Sep 8, 2025
e70f2e7
Refactor version checking scripts.
kirkrodrigues Sep 8, 2025
bd528a7
Refactor installation scripts.
kirkrodrigues Sep 8, 2025
cf30eea
Add components/core/tools to yaml-linting.
kirkrodrigues Sep 8, 2025
d26a13f
Apply shfmt.
kirkrodrigues Sep 8, 2025
e890c0e
Apply suggestions from code review
Bill-hbrhbr Sep 8, 2025
81a0c1f
copy changes to ubuntu-jammy
Bill-hbrhbr Sep 8, 2025
1ed15ec
refactor pipx-packages scripts
Bill-hbrhbr Sep 8, 2025
56a9a54
fix original lib version checking script removal
Bill-hbrhbr Sep 8, 2025
d457236
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 9, 2025
8aff56e
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 10, 2025
c395102
Rename package_exists to package_preinstalled; Use 0 for true and 1 f…
kirkrodrigues Sep 10, 2025
055a573
Minor refactorin.
kirkrodrigues Sep 10, 2025
57df29e
Dedupliicate task version constraint.
kirkrodrigues Sep 10, 2025
31b21c5
Dedupliicate uv version constraint.
kirkrodrigues Sep 10, 2025
9297f67
Dedupliicate cmake version constraint.
kirkrodrigues Sep 10, 2025
c1ab120
Bump minimum required cmake ver of building clp-core to 3.23
Bill-hbrhbr Sep 10, 2025
b417e1d
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 10, 2025
a73e389
Update components/core/CMakeLists.txt
Bill-hbrhbr Sep 10, 2025
3bb30a6
Move script_dir to right before usage in updated shell scripts
Bill-hbrhbr Sep 10, 2025
95a7b81
Merge branch 'main' into pipx-install
Bill-hbrhbr Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/clp-core-build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ jobs:
rm -f /usr/local/bin/pydoc3*
rm -f /usr/local/bin/python3*

- name: "Remove preinstalled programs which will conflict with the pipx-installed packages"
run: |
if brew list --formula cmake >/dev/null 2>&1; then
brew uninstall --force cmake
fi

- name: "Install dependencies"
run: "./components/core/tools/scripts/lib_install/macos/install-all.sh"

Expand Down
7 changes: 5 additions & 2 deletions components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
ADD ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/scripts/lib_install/centos-stream-9/install-all.sh
# Set pipx environment vars so that the pipx scripts install into the global locations without
# passing the `--global` flag.
ENV PIPX_BIN_DIR=/usr/local/bin
ENV PIPX_HOME=/opt/pipx

RUN pip3 install --no-cache-dir uv
RUN ./tools/scripts/lib_install/centos-stream-9/install-all.sh

# Remove cached files
RUN dnf clean all \
Expand Down
3 changes: 3 additions & 0 deletions components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
COPY ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN pipx uninstall cmake
RUN pipx uninstall uv

RUN ./tools/scripts/lib_install/manylinux_2_28/install-all.sh

# Remove cached files
Expand Down
3 changes: 3 additions & 0 deletions components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
COPY ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN pipx uninstall cmake
RUN pipx uninstall uv

RUN ./tools/scripts/lib_install/manylinux_2_28/install-all.sh

# Remove cached files
Expand Down
3 changes: 3 additions & 0 deletions components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
COPY ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN pipx uninstall cmake
RUN pipx uninstall uv

RUN ./tools/scripts/lib_install/musllinux_1_2/install-all.sh

# Remove cached files
Expand Down
3 changes: 3 additions & 0 deletions components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
COPY ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN pipx uninstall cmake
RUN pipx uninstall uv

RUN ./tools/scripts/lib_install/musllinux_1_2/install-all.sh

# Remove cached files
Expand Down
7 changes: 5 additions & 2 deletions components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ WORKDIR /root
RUN mkdir -p ./tools/scripts/lib_install
ADD ./tools/scripts/lib_install ./tools/scripts/lib_install

RUN ./tools/scripts/lib_install/ubuntu-jammy/install-all.sh
# Set pipx environment vars so that the pipx scripts install into the global locations without
# passing the `--global` flag.
ENV PIPX_BIN_DIR=/usr/local/bin
ENV PIPX_HOME=/opt/pipx
Comment on lines +8 to +11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Ensure PIPX_HOME aligns with other images.

Ubuntu sets /opt/pipx; verify many/musl images and CI use the same, or set safe defaults in the installers to avoid cross-image drift.

🏁 Script executed:

#!/usr/bin/env bash
rg -n 'ENV\s+PIPX_HOME' components/core/tools/docker-images -C1

Length of output: 581

🏁 Script executed:

#!/usr/bin/env bash

# List all Dockerfiles under the docker-images directory
echo "== Dockerfiles =="
fd --type f -e Dockerfile components/core/tools/docker-images

# Show all occurrences of pipx (including ENV settings) in those files
echo -e "\n== pipx occurrences =="
rg -n 'pipx' -C2 components/core/tools/docker-images

Length of output: 5055

Consolidate PIPX environment variables across images
musllinux and manylinux Dockerfiles don’t define ENV PIPX_BIN_DIR=/usr/local/bin and ENV PIPX_HOME=/opt/pipx. Add these or enforce the same defaults in your installer scripts to avoid cross-image drift.

🤖 Prompt for AI Agents 
In components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile
around lines 8 to 11, the Dockerfile sets PIPX_BIN_DIR and PIPX_HOME but other
images (musllinux, manylinux) lack these SAME ENV settings causing cross-image
drift; ensure consistency by adding ENV PIPX_BIN_DIR=/usr/local/bin and ENV
PIPX_HOME=/opt/pipx to the musllinux and manylinux Dockerfiles (or alternatively
update the shared installer scripts to export these defaults before pipx
installs) so all images use the same pipx paths.


RUN pip3 install --no-cache-dir uv
RUN ./tools/scripts/lib_install/ubuntu-jammy/install-all.sh

# Remove cached files
RUN apt-get clean \
Expand Down
13 changes: 4 additions & 9 deletions components/core/tools/scripts/lib_install/centos-stream-9/install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#!/usr/bin/env bash

# Exit on any error
set -e
set -o errexit
set -o nounset
set -o pipefail

# Error on undefined variable
set -u

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

"${script_dir}/install-prebuilt-packages.sh"
"${script_dir}/install-packages-from-source.sh"

# TODO: https://github.com/y-scope/clp/issues/795
"${script_dir}/../check-cmake-version.sh"
39 changes: 9 additions & 30 deletions components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/usr/bin/env bash

# Exit on any error
set -e
set -o errexit
set -o nounset
set -o pipefail

# Error on undefined variable
set -u
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

dnf install -y \
cmake \
diffutils \
gcc-c++ \
git \
Expand All @@ -23,29 +22,9 @@ dnf install -y \
python3-pip \
unzip

# Determine architecture for `task` release to install
rpm_arch=$(rpm --eval "%{_arch}")
case "$rpm_arch" in
"x86_64")
task_pkg_arch="amd64"
;;
"aarch64")
task_pkg_arch="arm64"
;;
*)
echo "Error: Unsupported architecture - $rpm_arch"
exit 1
;;
esac
if ! command -v pipx >/dev/null 2>&1; then
python3 -m pip install pipx
fi

# Install `task`
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
task_pkg_path="$(mktemp -t --suffix ".rpm" task-pkg.XXXXXXXXXX)"
curl \
--fail \
--location \
--output "$task_pkg_path" \
--show-error \
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.rpm"
dnf install --assumeyes "$task_pkg_path"
rm "$task_pkg_path"
# Install remaining packages through pipx
"${script_dir}/../pipx-packages/install-all.sh"
17 changes: 0 additions & 17 deletions components/core/tools/scripts/lib_install/check-cmake-version.sh
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions components/core/tools/scripts/lib_install/install-cmake.sh
View file
Open in desktop

This file was deleted.

53 changes: 17 additions & 36 deletions components/core/tools/scripts/lib_install/macos/install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,31 @@
#!/usr/bin/env bash

# Exit on any error
set -e
set -o errexit
set -o nounset
set -o pipefail

# Error on undefined variable
set -u
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

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
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.40,<3.43"

# Install uv
if ! command -v uv ; then
pipx install "uv>=0.8"
fi

brew install \
coreutils \
gcc \
java11 \
libarchive \
llvm@16 \
lz4 \
mariadb-connector-c \
xz \
zstd
coreutils \
gcc \
java11 \
libarchive \
llvm@16 \
lz4 \
mariadb-connector-c \
pipx \
xz \
zstd
Comment on lines +9 to +18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Verify Homebrew formula names; “java11” is likely incorrect.
Homebrew commonly uses openjdk@11 (not java11). Please verify and adjust to avoid CI breakage. Consider ensuring pipx PATH as well.

-    java11 \
+    openjdk@11 \
     libarchive \
@@
-    pipx \
+    pipx \

Additionally, add:

 brew update
+python3 -m pipx ensurepath || true
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
coreutils \
gcc \
java11 \
libarchive \
llvm@16 \
lz4 \
mariadb-connector-c \
pipx \
xz \
zstd
brew update
python3 -m pipx ensurepath || true
brew install \
coreutils \
gcc \
openjdk@11 \
libarchive \
llvm@16 \
lz4 \
mariadb-connector-c \
pipx \
xz \
zstd
🤖 Prompt for AI Agents 
In components/core/tools/scripts/lib_install/macos/install-all.sh around lines
11 to 20, the Homebrew formula list likely contains an incorrect formula name
("java11") and missing pipx PATH handling; replace "java11" with the correct
Homebrew formula "openjdk@11", verify all other formula names against Homebrew
(e.g., llvm@16, mariadb-connector-c), and ensure pipx is installed and
functional by running the Homebrew install for pipx and then invoking the pipx
path setup (e.g., call pipx ensurepath or add the pipx binary path to PATH) so
CI won't break due to missing/incorrect formula names or pipx not being on PATH.


# Install pkg-config if it isn't already installed
# NOTE: We might expect that pkg-config is installed through brew, so trying to install it again
# would be harmless; however, in certain environments, like the macOS GitHub hosted runner,
# pkg-config is installed by other means, meaning a brew install would cause conflicts.
if ! command -v pkg-config ; then
if ! command -v pkg-config >/dev/null 2>&1; then
brew install pkg-config
fi

# TODO: https://github.com/y-scope/clp/issues/795
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
"${script_dir}/../check-cmake-version.sh"
# Install remaining packages through pipx
"${script_dir}/../pipx-packages/install-all.sh"
8 changes: 3 additions & 5 deletions components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env bash

set -eu
set -o errexit
set -o nounset
set -o pipefail

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Confirm script_dir resolution matches peers.

Align with the prevailing pattern across lib_install to avoid subtle drift.

🤖 Prompt for AI Agents 
components/core/tools/scripts/lib_install/manylinux_2_28/install-all.sh lines 7:
the script_dir assignment must match the prevailing lib_install pattern used
across other scripts; locate the canonical assignment (e.g. the exact variable
name and resolution expression used in sibling scripts), replace the current
line with that exact expression so behavior and compatibility are identical, and
run a quick shellcheck or small test to confirm the resolved path matches peers.


"${script_dir}/install-prebuilt-packages.sh"
"${script_dir}/install-packages-from-source.sh"

# TODO: https://github.com/y-scope/clp/issues/795
"${script_dir}/../check-cmake-version.sh"
37 changes: 6 additions & 31 deletions components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env bash

set -eu
set -o errexit
set -o nounset
set -o pipefail

script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

dnf install -y \
gcc-c++ \
java-11-openjdk \
Expand All @@ -13,33 +16,5 @@ dnf install -y \
zlib-devel \
zlib-static

# Determine architecture for `task` release to install
rpm_arch=$(rpm --eval "%{_arch}")
case "$rpm_arch" in
"x86_64")
task_pkg_arch="amd64"
;;
"aarch64")
task_pkg_arch="arm64"
;;
*)
echo "Error: Unsupported architecture - $rpm_arch"
exit 1
;;
esac

# Install `task`
# NOTE: We lock `task` to version 3.44.0 to avoid https://github.com/y-scope/clp-ffi-js/issues/110
task_pkg_path=$(mktemp -t --suffix ".rpm" task-pkg.XXXXXXXXXX) || exit 1
curl \
--fail \
--location \
--output "$task_pkg_path" \
--show-error \
"https://github.com/go-task/task/releases/download/v3.44.0/task_linux_${task_pkg_arch}.rpm"
dnf install --assumeyes "$task_pkg_path"
rm "$task_pkg_path"

# Downgrade to CMake v3 to work around https://github.com/y-scope/clp/issues/795
pipx uninstall cmake
pipx install cmake~=3.31
# Install remaining packages through pipx
"${script_dir}/../pipx-packages/install-all.sh"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Provision pipx and export dirs before calling the installer.
On manylinux images pipx may be absent; the call will fail. Exporting PIPX_* stabilises paths.

 # Install remaining packages through pipx
-"${script_dir}/../pipx-packages/install-all.sh"
+if ! command -v pipx >/dev/null 2>&1; then
+    dnf install -y pipx python3-pip || python3 -m pip install --upgrade pipx
+    python3 -m pipx ensurepath || true
+fi
+export PIPX_HOME="${PIPX_HOME:-/opt/_internal/pipx}"
+export PIPX_BIN_DIR="${PIPX_BIN_DIR:-/usr/local/bin}"
+"${script_dir}/../pipx-packages/install-all.sh"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# Install remaining packages through pipx
"${script_dir}/../pipx-packages/install-all.sh"
# Install remaining packages through pipx
if ! command -v pipx >/dev/null 2>&1; then
dnf install -y pipx python3-pip || python3 -m pip install --upgrade pipx
python3 -m pipx ensurepath || true
fi
export PIPX_HOME="${PIPX_HOME:-/opt/_internal/pipx}"
export PIPX_BIN_DIR="${PIPX_BIN_DIR:-/usr/local/bin}"
"${script_dir}/../pipx-packages/install-all.sh"
🤖 Prompt for AI Agents 
In
components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh
around lines 19-20, ensure pipx is provisioned and PIPX environment variables
are exported before invoking the installer: check for pipx and install it if
missing (e.g. via python -m pip install --user pipx), export stable PIPX_HOME
and PIPX_BIN_DIR (and update PATH) so the installer can find pipx, and only then
call "${script_dir}/../pipx-packages/install-all.sh".

8 changes: 3 additions & 5 deletions components/core/tools/scripts/lib_install/musllinux_1_2/install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env bash

set -eu
set -o errexit
set -o nounset
set -o pipefail

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Keep script_dir style consistent.

If other platform scripts use the simpler pwd form (no -P), mirror that for consistency; otherwise consider adopting -P everywhere together in a follow-up.

🤖 Prompt for AI Agents 
In components/core/tools/scripts/lib_install/musllinux_1_2/install-all.sh around
line 7, the script_dir assignment should follow the simpler pwd style used by
other platform scripts; replace any usage of "pwd -P" with plain "pwd" here so
this file matches the existing simpler form (if other scripts actually use plain
pwd) — if you discover most scripts use "-P" instead, convert this file to use
"pwd -P" and plan a follow-up to standardize all scripts consistently.


"${script_dir}/install-prebuilt-packages.sh"
"${script_dir}/install-packages-from-source.sh"

# TODO: https://github.com/y-scope/clp/issues/795
"${script_dir}/../check-cmake-version.sh"
Loading
Loading