Skip to content

Commit

Permalink
[.travis.yml] fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Naoki-Hiraoka committed Jun 20, 2021
1 parent 13dfd61 commit 572718e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
###
- git:
uri: https://github.com/Naoki-Hiraoka/openhrp3
local-name: for-travis
local-name: openhrp3
version: for-travis
- git:
uri: https://github.com/fkanehiro/hrpsys-base
local-name: hrpsys
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ script:
- if [ "${IS_EUSLISP_TRAVIS_TEST}" != "true" ] ; then export ROS_PARALLEL_JOBS="-j2 -l2" ; fi
- if [ "${ROS_DISTRO}" == "hydro" ] ; then sudo apt-get install -y --force-yes gdebi && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-tools_0.3.1-1_all.deb && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-tools_0.3.1-1_all.deb && sudo apt-mark hold python-catkin-tools; fi
- if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else source ./.travis_test.sh ; fi
- if [ "${TEST_TYPE}" != "" ] ; then case $ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; "melodic") export DISTRO=bionic;; esac; fi
- if [ "${TEST_TYPE}" != "" ] ; then docker run -v $HOME:$HOME -e CI_SOURCE_PATH -e HOME -e ROS_DISTRO -e TEST_TYPE -e TEST_PACKAGE -e EXTRA_DEB -e ROS_PARALLEL_JOBS ubuntu:$DISTRO bash -c 'cd $CI_SOURCE_PATH; source ./.travis_test.sh'; fi
- ccache -s
after_success:
- if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then cd ${TRAVIS_BUILD_DIR}; openssl aes-256-cbc -K $encrypted_b79fc5843df3_key -iv $encrypted_b79fc5843df3_iv -in .secrets.tar.enc -out .secrets.tar -d; tar -C ~/ -xvf .secrets.tar; fi
Expand Down
8 changes: 4 additions & 4 deletions .travis_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ if [ "$TEST_TYPE" == "work_with_downstream" ]; then
wstool set openhrp3 http://github.com/Naoki-Hiraoka/openhrp3 --git -y -v for-travis
wstool update
cd ..
sudo apt-get install -qq -y doxygen

sudo dpkg -r --force-depends ros-$ROS_DISTRO-hrpsys-ros-bridge
sudo dpkg -r --force-depends ros-$ROS_DISTRO-hrpsys-tools
sudo dpkg -r --force-depends ros-$ROS_DISTRO-rtmbuild
# https://github.com/start-jsk/rtmros_hironx/issues/287
sudo sed -i s@test_tf_and_controller@_test_tf_and_controller@ /opt/ros/$ROS_DISTRO/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py
catkin_make $ROS_PARALLEL_JOBS
catkin_make install $ROS_PARALLEL_JOBS
catkin_make_isolated --install $ROS_PARALLEL_JOBS
else
echo "
#
Expand All @@ -78,6 +78,7 @@ else
wstool set rtmros_nextage http://github.com/tork-a/rtmros_nextage --git -y
wstool update
cd ..
sudo apt-get install -qq -y doxygen
# do not install rtmros_common because we want to use them
find src
for _pkg in hrpsys_ros_bridge hrpsys_tools rtmbuild; do
Expand All @@ -89,8 +90,7 @@ else
sed -i "s@install(@dummy_install(@g" src/rtmros_common/${_pkg}/catkin.cmake
fi
done
catkin_make $ROS_PARALLEL_JOBS --only-pkg-with-deps `echo $pkg | sed s/-/_/g`
catkin_make install $ROS_PARALLEL_JOBS
catkin_make_isolated --install $ROS_PARALLEL_JOBS --only-pkg-with-deps `echo $pkg | sed s/-/_/g`
# make sure to kill test
for _pkg in hrpsys_ros_bridge hrpsys_tools rtmbuild; do
rm -fr install/lib/${_pkg}
Expand Down

0 comments on commit 572718e

Please sign in to comment.