Skip to content

Commit ef0a66b

Browse files
committed
ci(sbuild): install Astral uv in chroot to satisfy RediSearch test deps (PR #6715) and add curl
1 parent f8fd60a commit ef0a66b

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

setup_sbuild.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ sbuild-createchroot --arch=${arch} --make-sbuild-tarball=/var/lib/sbuild/${dist}
4545
# For cross-compilation, install the necessary packages
4646
if [ "$arch" != "$host_arch" ]; then
4747
echo "Setting up cross-compilation environment from $host_arch to $arch"
48-
48+
4949
# Install cross-compilation tools in the chroot
5050
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get update
5151
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get install -y crossbuild-essential-${arch}
52-
52+
5353
# Create a file to tell sbuild this is a cross-compilation environment
5454
schroot -c source:${dist}-${arch}-sbuild -d / -- touch /etc/sbuild-cross-building
5555
fi
@@ -85,7 +85,14 @@ fi
8585

8686
# Install native build tools in the chroot
8787
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get update
88-
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get install -y build-essential python3 python3-pip python3-venv python3-dev g++ clang
88+
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get install -y build-essential python3 python3-pip python3-venv python3-dev g++ clang curl
89+
90+
# Install Astral uv inside chroot for RediSearch test dependencies that expect it
91+
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -lc "set -e; curl --proto '=https' --tlsv1.2 -LsSf https://astral.sh/uv/install.sh | sh"
92+
# Make uv available system-wide in chroot PATH
93+
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -lc "install -m 0755 \"$HOME/.local/bin/uv\" /usr/local/bin/uv || cp -f \"$HOME/.local/bin/uv\" /usr/local/bin/uv"
94+
# Verify uv installed
95+
schroot -c source:${dist}-${arch}-sbuild -d / -- uv -V
8996

9097
# Install latest CMake version for Jammy and Bullseye
9198
if [ "$dist" = "jammy" ] || [ "$dist" = "bullseye" ]; then

0 commit comments

Comments
 (0)