@@ -34,6 +34,12 @@ function setup {
34
34
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key 0xCBF125EA
35
35
fi
36
36
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
+ # ##
37
43
# Install ROS
38
44
sudo apt-get install -y -q python-catkin-pkg python-catkin-tools python-rosdep python-wstool python-rosinstall-generator ros-$ROS_DISTRO -catkin
39
45
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
108
114
echo ' debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
109
115
travis_time_end
110
116
111
- if [ $TEST == " catkin_lint" ]; then
117
+ if [ " $TEST " == " catkin_lint" ]; then
112
118
113
119
travis_time_start catkin_lint.script
114
120
apt-get install -y -q python-pip
@@ -119,7 +125,7 @@ if [ $TEST == "catkin_lint" ]; then
119
125
ROS_DISTRO=melodic catkin_lint --resolve-env --strict $CI_SOURCE_PATH
120
126
121
127
122
- elif [ $TEST == " clang-format" ]; then
128
+ elif [ " $TEST " == " clang-format" ]; then
123
129
124
130
travis_time_start clang_format.script
125
131
apt-get install -y -q clang-format-3.9 git
@@ -128,7 +134,7 @@ elif [ $TEST == "clang-format" ]; then
128
134
git -C $CI_SOURCE_PATH --no-pager diff
129
135
git -C $CI_SOURCE_PATH diff-index --quiet HEAD -- .
130
136
131
- elif [ $TEST == " clang-tidy" ]; then
137
+ elif [ " $TEST " == " clang-tidy" ]; then
132
138
133
139
setup
134
140
0 commit comments