From a459c7cdeefd8535c2fd37a6b77b2a88f7339849 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 24 Sep 2020 14:37:53 +0200
Subject: [PATCH] ci: .travis.yml: Refactor, add working focal and xenial
 builds.

The existing targets for precise and osx breaks, both on dependencies.
Seems to be about the 'rosdep install'  command in the Makefile(?),
which is beyond my current scope.

Add a new target for Ubuntu focal which works after refactoring the
.travis.yml file.

Gbp-Pq: Name 0011-ci-.travis.yml-Refactor-add-working-focal-build.patch

travis
---
 .travis.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3e508a..8b0d801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,52 @@
-os:
-  - linux
-  - osx
+---
 language: cpp
-install:
-  - make install_deps
-  - source setup.bash
-script:
-  - mkdir build && cd build && cmake .. -DPYTHON_EXECUTABLE=$(which python2) && make && make tests && make run_tests
-  - catkin_test_results .
+matrix:
+  include:
+    - os: linux
+      dist: focal
+      compiler: gcc
+      script:
+        - sudo apt update
+        - >
+          sudo apt install
+          build-essential cmake doxygen graphviz googletest libgtest-dev
+        - mkdir build && cd build
+        - cmake -DDISABLE_CATKIN=ON ..
+        - make
+        - make test
+    - os: linux
+      dist: xenial
+      compiler: gcc
+      script:
+        - sudo apt update
+        - >
+          sudo apt install
+          build-essential catkin cmake doxygen graphviz libgtest-dev
+        - mkdir build && cd build
+        - cmake -DDISABLE_CATKIN=OFF -DCATKIN_ENABLE_TESTING=OFF ..
+        - make
 
+
+#   Does not build, breaks in make install_deps.
+#   - os: linux
+#     dist: precise
+#     compiler: gcc
+#     install:
+#       - make install_deps
+#       - source setup.bash
+#     script:
+#       - mkdir build && cd build
+#       - cmake -DPYTHON_EXECUTABLE=$(which python2) ..
+#       - make
+#       - make test
+
+#   - os: osx
+#     compiler: clang
+#     install:
+#       - make install_deps
+#       - source setup.bash
+#     script:
+#       - mkdir build && cd build
+#       - cmake -DPYTHON_EXECUTABLE=$(which python2) ..
+#       - make
+#       - make run_tests