Skip to content

Commit

Permalink
Merge pull request #98 from k-okada/fix_hydro_error
Browse files Browse the repository at this point in the history
add hot fix for hydro test
  • Loading branch information
k-okada authored Oct 27, 2019
2 parents 3fb4842 + 83e6a65 commit 7255bf9
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ function setup {
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 0xCBF125EA
fi
sudo apt-get update -qq
### HotFix: Hold python-vcs-tools for hydro (https://github.com/vcstools/vcstools/issues/157)
if [[ "$ROS_DISTRO" == "hydro" ]]; then
sudo apt-get install -y --force-yes -q python-vcstools=0.1.40-1
sudo apt-mark hold python-vcstools
fi
###
# Install ROS
sudo apt-get install -y -q python-catkin-pkg python-catkin-tools python-rosdep python-wstool python-rosinstall-generator ros-$ROS_DISTRO-catkin
source /opt/ros/$ROS_DISTRO/setup.bash
Expand Down Expand Up @@ -108,7 +114,7 @@ apt-get update -qq && apt-get install -y -q wget sudo lsb-release gnupg # for do
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
travis_time_end

if [ $TEST == "catkin_lint" ]; then
if [ "$TEST" == "catkin_lint" ]; then

travis_time_start catkin_lint.script
apt-get install -y -q python-pip
Expand All @@ -119,7 +125,7 @@ if [ $TEST == "catkin_lint" ]; then
ROS_DISTRO=melodic catkin_lint --resolve-env --strict $CI_SOURCE_PATH


elif [ $TEST == "clang-format" ]; then
elif [ "$TEST" == "clang-format" ]; then

travis_time_start clang_format.script
apt-get install -y -q clang-format-3.9 git
Expand All @@ -128,7 +134,7 @@ elif [ $TEST == "clang-format" ]; then
git -C $CI_SOURCE_PATH --no-pager diff
git -C $CI_SOURCE_PATH diff-index --quiet HEAD -- .

elif [ $TEST == "clang-tidy" ]; then
elif [ "$TEST" == "clang-tidy" ]; then

setup

Expand Down

0 comments on commit 7255bf9

Please sign in to comment.