Skip to content

Commit 7255bf9

Browse files
authored
Merge pull request #98 from k-okada/fix_hydro_error
add hot fix for hydro test
2 parents 3fb4842 + 83e6a65 commit 7255bf9

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

.travis.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ function setup {
3434
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 0xCBF125EA
3535
fi
3636
sudo apt-get update -qq
37+
### HotFix: Hold python-vcs-tools for hydro (https://github.com/vcstools/vcstools/issues/157)
38+
if [[ "$ROS_DISTRO" == "hydro" ]]; then
39+
sudo apt-get install -y --force-yes -q python-vcstools=0.1.40-1
40+
sudo apt-mark hold python-vcstools
41+
fi
42+
###
3743
# Install ROS
3844
sudo apt-get install -y -q python-catkin-pkg python-catkin-tools python-rosdep python-wstool python-rosinstall-generator ros-$ROS_DISTRO-catkin
3945
source /opt/ros/$ROS_DISTRO/setup.bash
@@ -108,7 +114,7 @@ apt-get update -qq && apt-get install -y -q wget sudo lsb-release gnupg # for do
108114
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
109115
travis_time_end
110116

111-
if [ $TEST == "catkin_lint" ]; then
117+
if [ "$TEST" == "catkin_lint" ]; then
112118

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

121127

122-
elif [ $TEST == "clang-format" ]; then
128+
elif [ "$TEST" == "clang-format" ]; then
123129

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

131-
elif [ $TEST == "clang-tidy" ]; then
137+
elif [ "$TEST" == "clang-tidy" ]; then
132138

133139
setup
134140

0 commit comments

Comments
 (0)