diff --git a/.ci/docker/ubuntu-artful b/.ci/docker/ubuntu-artful deleted file mode 100644 index 6b185dfad2252..0000000000000 --- a/.ci/docker/ubuntu-artful +++ /dev/null @@ -1,29 +0,0 @@ -FROM ubuntu:artful - -RUN apt-get update -qq -RUN apt-get install -y \ - sudo \ - build-essential \ - cmake \ - pkg-config \ - libassimp-dev \ - libboost-filesystem-dev \ - libboost-regex-dev \ - libboost-system-dev \ - libccd-dev \ - libeigen3-dev \ - libfcl-dev \ - freeglut3-dev \ - libxi-dev \ - libxmu-dev \ - libbullet-dev \ - libode-dev \ - libflann-dev \ - libnlopt-dev \ - coinor-libipopt-dev \ - libtinyxml2-dev \ - liburdfdom-dev \ - liburdfdom-headers-dev \ - libopenscenegraph-dev \ - clang-format-3.8 \ - lcov diff --git a/.ci/docker/ubuntu-bionic b/.ci/docker/ubuntu-bionic index d692a21a6a922..b174e92ff3bd2 100644 --- a/.ci/docker/ubuntu-bionic +++ b/.ci/docker/ubuntu-bionic @@ -25,5 +25,5 @@ RUN apt-get install -y \ liburdfdom-dev \ liburdfdom-headers-dev \ libopenscenegraph-dev \ - clang-format-3.8 \ + # clang-format-3.8 \ # Disable until higher version is supported lcov diff --git a/.ci/script.sh b/.ci/script.sh index 813050375daa7..cc8cf8a6c3036 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -6,7 +6,7 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_VERBOSE=ON -DDART_TREAT_WARNINGS_AS_ERRORS=ON -DDART_CODECOV=$CODECOV .. if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j4 tutorials examples tests; else make -j4 tests; fi -if [ "$TRAVIS_OS_NAME" = "linux" ]; then make check-format; fi +if [ "$TRAVIS_OS_NAME" = "linux" ] && [ $(lsb_release -sc) = "trusty" ]; then make check-format; fi if [ $CODECOV = ON ]; then make -j4 codecov; else ctest --output-on-failure -j4; fi # Make sure we can install with no issues diff --git a/.travis.yml b/.travis.yml index ee3ac6abf0ca0..189b25bd418e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,6 @@ matrix: - os: linux env: DOCKER_FILE="ubuntu-xenial" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC services: docker - - os: linux - env: DOCKER_FILE="ubuntu-artful" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC - services: docker - os: linux env: DOCKER_FILE="ubuntu-bionic" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC services: docker