Skip to content

Commit

Permalink
Merge pull request #380 from k-okada/fix_travis
Browse files Browse the repository at this point in the history
add melodic/noetic test
  • Loading branch information
k-okada authored Sep 30, 2021
2 parents ac270fb + a7de88e commit f2352f4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
15 changes: 13 additions & 2 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ echo "DISTRO=$DISTRO"
env | grep ROS

apt-get update -qq
apt-get install -qq -y sudo wget git lsb-release
apt-get install -qq -y sudo wget git lsb-release gnupg

function error {
## after_failure:
Expand Down Expand Up @@ -43,10 +43,21 @@ if [ "$CI_ROS_DISTRO" == "kinetic" ]; then
fi
#######
## install:
# set DEBIAN_FRONTEND=noninteractive
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
sudo sh -c "echo \"deb ${DEB_REPOSITORY} `lsb_release -cs` main\" > /etc/apt/sources.list.d/ros-latest.list"
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get install -qq -y python-rosdep python-catkin-tools
if [[ "$CI_ROS_DISTRO" == "noetic" ]]; then
sudo apt-get install -qq -y python3-rosdep python3-catkin-tools
else
sudo apt-get install -qq -y python-rosdep python-catkin-tools
fi
if [[ "$CI_ROS_DISTRO" == "melodic" || "$CI_ROS_DISTRO" == "noetic" ]]; then
git clone https://github.com/turtlebot-release/turtlebot-release -b release/kinetic/turtlebot_description
git clone https://github.com/turtlebot-release/turtlebot_create-release -b release/kinetic/create_description
git clone https://github.com/yujinrobot-release/kobuki-release -b release/kinetic/kobuki_description
fi
sudo rosdep init
rosdep update --include-eol-distros
# Use rosdep to install all dependencies (including ROS itself)
Expand Down
12 changes: 9 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,15 @@ env:
- CATKIN_WS_SRC=${CATKIN_WS}/src
matrix:
- CI_ROS_DISTRO="indigo" DEB_REPOSITORY=http://packages.ros.org/ros/ubuntu
- CI_ROS_DISTRO="indigo" DEB_REPOSITORY=http://packages.ros.org/ros-testing/ubuntu
- CI_ROS_DISTRO="kinetic" DEB_REPOSITORY=http://packages.ros.org/ros/ubuntu
- CI_ROS_DISTRO="kinetic" DEB_REPOSITORY=http://packages.ros.org/ros-testing/ubuntu
- CI_ROS_DISTRO="melodic" DEB_REPOSITORY=http://packages.ros.org/ros/ubuntu
- CI_ROS_DISTRO="melodic" DEB_REPOSITORY=http://packages.ros.org/ros-testing/ubuntu
- CI_ROS_DISTRO="noetic" DEB_REPOSITORY=http://packages.ros.org/ros/ubuntu
- CI_ROS_DISTRO="noetic" DEB_REPOSITORY=http://packages.ros.org/ros-testing/ubuntu
matrix:
allow_failures:
- env: CI_ROS_DISTRO="noetic" DEB_REPOSITORY=http://packages.ros.org/ros/ubuntu
- env: CI_ROS_DISTRO="noetic" DEB_REPOSITORY=http://packages.ros.org/ros-testing/ubuntu
notifications:
email:
recipients:
Expand All @@ -34,7 +40,7 @@ before_install:
- export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
- xhost +local:root
# docekr setup
- case $CI_ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; esac;
- case $CI_ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; "melodic") export DISTRO=bionic;; "noetic") export DISTRO=focal;; esac;
- export DOCKER_IMAGE=ubuntu:$DISTRO
- docker images
script:
Expand Down

0 comments on commit f2352f4

Please sign in to comment.