diff --git a/.travis.sh b/.travis.sh index df8f561a0..1b8ee4de9 100644 --- a/.travis.sh +++ b/.travis.sh @@ -71,6 +71,6 @@ fi # Build catkin config --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -catkin build -p1 -j1 --no-status +catkin build --no-status catkin build --catkin-make-args run_tests -- -i --no-deps --no-status -p 1 -j 1 aerial_robot catkin_test_results --verbose build || catkin_test_results --all build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 803f11213..000000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -sudo: required -dist: trusty -language: generic -env: - matrix: - - ROS_DISTRO="kinetic" REPOSITORY=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO="melodic" REPOSITORY=http://packages.ros.org/ros/ubuntu - -install: - - case $ROS_DISTRO in "kinetic") export DISTRO=xenial;; "melodic") export DISTRO=bionic ;; esac; - - export DOCKER_IMAGE=ubuntu:$DISTRO - - export CI_SOURCE_PATH=$(pwd) - - export REPOSITORY_NAME=${PWD##*/} - - docker images - - docker run -v $HOME:$HOME -e CI_SOURCE_PATH -e REPOSITORY_NAME -e HOME -e DISTRO -e ROS_DISTRO -e REPOSITORY $DOCKER_IMAGE bash -c 'cd $CI_SOURCE_PATH; source .travis.sh'