From f014d055bd02cf02b41847159e74b050efda4943 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 16 Aug 2024 18:08:56 +0900 Subject: [PATCH] skip pip dependency in bloom-generate, use https://github.com/ros-infrastructure/bloom/pull/412, this will solve the problem such as: The following packages have unmet dependencies: ros-one-jsk-data : Depends: gdown but it is not installable where gdown is defined as pip package. See https://github.com/ros/rosdistro/blob/0adeee9a8a0fd2825b47aeeb3efeffba3465774c/rosdep/python.yaml#L1667-L1670 --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 31bf453..a629315 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,11 @@ #!/bin/sh # SPDX-License-Identifier: BSD-3-Clause +if ! bloom-release --help 2>&1 | grep -q -- --skip-pip; then + (cd /tmp/; git clone https://github.com/ros-infrastructure/bloom -b 0.10.7 bloom-$$) + (cd /tmp/bloom-$$; wget https://github.com/ros-infrastructure/bloom/pull/412.diff; patch -p1 < 412.diff; pip install .) +fi + echo "::group::Prepare build" set -ex @@ -100,7 +105,7 @@ build_deb(){ # dash does not support `set -o pipefail`, so we work around it with a named pipe mkfifo bloom_fifo tee /home/runner/apt_repo/${bloom_log} < bloom_fifo & - bloom-generate "${BLOOM}debian" --os-name="$DISTRIBUTION" --os-version="$DEB_DISTRO" --ros-distro="$ROS_DISTRO" > bloom_fifo 2>&1 + bloom-generate "${BLOOM}debian" --skip-pip --os-name="$DISTRIBUTION" --os-version="$DEB_DISTRO" --ros-distro="$ROS_DISTRO" > bloom_fifo 2>&1 bloom_success=$? rm bloom_fifo if [ $bloom_success -ne 0 ]; then