From db85e0894dea831904371e7fd89486bbbcb5abd6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Wed, 10 Jun 2020 11:13:34 +0200 Subject: [PATCH] Remove Ubuntu Trusty from CI. (#1699) Ubuntu 14.04 has reached end of standard support. Moves additional testing that was only done for Trusty to Bionic. --- .travis.yml | 1 - Dockerfile.bionic | 8 +++++++- Dockerfile.trusty | 37 ----------------------------------- cmake/modules/FindGMock.cmake | 2 -- docs/source/index.rst | 4 ++-- scripts/install_debs_cmake.sh | 7 ++----- 6 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 Dockerfile.trusty diff --git a/.travis.yml b/.travis.yml index 4d089cc..35aa102 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ cache: - /home/travis/docker/ env: - - LSB_RELEASE=trusty DOCKER_CACHE_FILE=/home/travis/docker/trusty-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=xenial DOCKER_CACHE_FILE=/home/travis/docker/xenial-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=bionic DOCKER_CACHE_FILE=/home/travis/docker/bionic-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=jessie DOCKER_CACHE_FILE=/home/travis/docker/jessie-cache.tar.gz CC=gcc CXX=g++ diff --git a/Dockerfile.bionic b/Dockerfile.bionic index 1de8281..ff20efa 100644 --- a/Dockerfile.bionic +++ b/Dockerfile.bionic @@ -30,5 +30,11 @@ COPY scripts/install_debs_cmake.sh cartographer/scripts/ RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/* COPY scripts/install_proto3.sh cartographer/scripts/ RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf +COPY scripts/install_grpc.sh cartographer/scripts/ +RUN cartographer/scripts/install_grpc.sh && rm -rf grpc +COPY scripts/install_async_grpc.sh cartographer/scripts/ +RUN cartographer/scripts/install_async_grpc.sh && rm -rf async_grpc +COPY scripts/install_prometheus_cpp.sh cartographer/scripts/ +RUN cartographer/scripts/install_prometheus_cpp.sh && rm -rf prometheus-cpp COPY . cartographer -RUN cartographer/scripts/install_cartographer_cmake.sh && rm -rf cartographer +RUN cartographer/scripts/install_cartographer_cmake_with_grpc.sh && rm -rf cartographer diff --git a/Dockerfile.trusty b/Dockerfile.trusty deleted file mode 100644 index ac96e93..0000000 --- a/Dockerfile.trusty +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2016 The Cartographer Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ubuntu:trusty - -ARG cc -ARG cxx - -# Set the preferred C/C++ compiler toolchain, if given (otherwise default). -ENV CC=$cc -ENV CXX=$cxx - -COPY scripts/install_debs_cmake.sh cartographer/scripts/ -RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/* -COPY scripts/install_ceres.sh cartographer/scripts/ -RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver -COPY scripts/install_proto3.sh cartographer/scripts/ -RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf -COPY scripts/install_grpc.sh cartographer/scripts/ -RUN cartographer/scripts/install_grpc.sh && rm -rf grpc -COPY scripts/install_async_grpc.sh cartographer/scripts/ -RUN cartographer/scripts/install_async_grpc.sh && rm -rf async_grpc -COPY scripts/install_prometheus_cpp.sh cartographer/scripts/ -RUN cartographer/scripts/install_prometheus_cpp.sh && rm -rf prometheus-cpp -COPY . cartographer -RUN cartographer/scripts/install_cartographer_cmake_with_grpc.sh && rm -rf cartographer diff --git a/cmake/modules/FindGMock.cmake b/cmake/modules/FindGMock.cmake index c663e98..952679e 100644 --- a/cmake/modules/FindGMock.cmake +++ b/cmake/modules/FindGMock.cmake @@ -57,8 +57,6 @@ if(NOT GMock_FOUND) add_subdirectory(${GMOCK_SRC_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock" EXCLUDE_FROM_ALL) endif() - # The next line is needed for Ubuntu Trusty. - set(GMOCK_INCLUDE_DIRS "${GMOCK_SRC_DIR}/gtest/include") set(GMOCK_LIBRARIES gmock_main) endif() endif() diff --git a/docs/source/index.rst b/docs/source/index.rst index 54b04d2..e466331 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -65,7 +65,7 @@ Getting started without ROS Please see our ROS integration as a starting point for integrating your system with the standalone library. Currently, it is the best available reference. -On Ubuntu 14.04 (Trusty): +On Ubuntu 16.04 (Xenial): .. literalinclude:: ../../scripts/install_debs_cmake.sh :language: bash @@ -93,7 +93,7 @@ on systems that meet the following requirements: * 64-bit, modern CPU (e.g. 3rd generation i7) * 16 GB RAM -* Ubuntu 14.04 (Trusty), 16.04 (Xenial), 18.04 (Bionic) +* Ubuntu 16.04 (Xenial), 18.04 (Bionic) * gcc version 4.8.4, 5.4.0, 7.5.0 Known Issues diff --git a/scripts/install_debs_cmake.sh b/scripts/install_debs_cmake.sh index db21f04..00d72d6 100755 --- a/scripts/install_debs_cmake.sh +++ b/scripts/install_debs_cmake.sh @@ -20,12 +20,9 @@ set -o verbose # Install the required libraries that are available as debs. sudo apt-get update -# Install CMake 3.2 for Ubuntu Trusty and Debian Jessie. +# Install CMake 3.2 for Debian Jessie. sudo apt-get install lsb-release -y -if [[ "$(lsb_release -sc)" = "trusty" ]] -then - sudo apt-get install cmake3 -y -elif [[ "$(lsb_release -sc)" = "jessie" ]] +if [[ "$(lsb_release -sc)" = "jessie" ]] then sudo sh -c "echo 'deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list" sudo sh -c "echo 'Acquire::Check-Valid-Until \"false\";' >> /etc/apt/apt.conf"