Skip to content

Commit

Permalink
Always install Gazebo 11 in apt CI to fix Unstable CI (#873)
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro committed Sep 3, 2021
1 parent d5f8e85 commit 29d1c97
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
19 changes: 17 additions & 2 deletions .ci/install_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,20 @@ apt-get install -y python3-dev python3-numpy python3-pybind11 pybind11-dev
# Octave
apt-get install -y liboctave-dev

# Gazebo (use distro packages to support both Ubuntu and Debian)
apt-get install -y libgazebo*-dev
# Gazebo
lsb_dist="$(. /etc/os-release && echo "$ID")"
dist_version="$(lsb_release -c | cut -d: -f2 | sed s/'^\t'//)"
echo "lsb_dist: ${lsb_dist}"
echo "dist_version: ${dist_version}"
# bullseye is not supported by OpenRobotics' repo, but it has already
# the right version of Gazebo in its repo, so we just skip everything
if [[ ("sid" != "$dist_version" && "bullseye" != "$dist_version") ]]; then
mkdir -p /etc/apt/sources.list.d
echo deb http://packages.osrfoundation.org/gazebo/$lsb_dist\-stable $dist_version main > /etc/apt/sources.list.d/gazebo-stable.list
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
apt-get update
apt-get install -y libgazebo11-dev
else
apt-get install -y libgazebo-dev
fi

1 change: 0 additions & 1 deletion cmake/ProjectsTagsUnstable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ set_tag(YARP_telemetry_TAG master)
set_tag(gym-ignition_TAG master)
# Workaround for https://github.com/robotology/robotology-superbuild/pull/844#issuecomment-893293323
set_tag(walking-teleoperation_TAG devel)

5 changes: 4 additions & 1 deletion scripts/install_apt_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ ROBSUP_DISTRO_NAME=$(lsb_release -i | cut -d: -f2 | sed s/'^\t'//)
ROBSUP_DISTRO_VERSION=$(lsb_release -r | cut -d: -f2 | sed s/'^\t'//)
ROBSUP_DISTRO_CODENAME=$(lsb_release -c | cut -d: -f2 | sed s/'^\t'//)

if [[ ("$ROBSUP_DISTRO_NAME" == "Ubuntu" && "$ROBSUP_DISTRO_VERSION" == "22.04") || ("$ROBSUP_DISTRO_NAME" == "Debian" && "$ROBSUP_DISTRO_CODENAME" == "bullseye") || ("$ROBSUP_DISTRO_NAME" == "Debian" && "$ROBSUP_DISTRO_CODENAME" == "bookworm") ]]
echo "ROBSUP_DISTRO_NAME: ${ROBSUP_DISTRO_NAME}"
echo "ROBSUP_DISTRO_VERSION: ${ROBSUP_DISTRO_VERSION}"
echo "ROBSUP_DISTRO_CODENAME: ${ROBSUP_DISTRO_CODENAME}"
if [[ ("$ROBSUP_DISTRO_NAME" == "Ubuntu" && "$ROBSUP_DISTRO_VERSION" == "22.04") || ("$ROBSUP_DISTRO_NAME" == "Debian" && "$ROBSUP_DISTRO_CODENAME" == "bullseye") || ("$ROBSUP_DISTRO_NAME" == "Debian" && "$ROBSUP_DISTRO_CODENAME" == "bookworm") || ("$ROBSUP_DISTRO_NAME" == "Debian" && "$ROBSUP_DISTRO_CODENAME" == "sid") ]]
then
apt-get install -y libdc1394-dev
else
Expand Down

0 comments on commit 29d1c97

Please sign in to comment.