From 8e0aac92c03a95a23671b272d74947c295289ad6 Mon Sep 17 00:00:00 2001
From: david gauchard <gauchard@laas.fr>
Date: Thu, 10 Oct 2019 17:30:59 +0200
Subject: [PATCH] CI: trusty (u14.04) -> bionic (u18.04) (#6627)

* no-op test

* no-op test

* bionic

* missing python package for doc building with bionic

* fix previous commit

* remove external repo for gcc7 (causing issues), it is default under bionic
fix python3-setuptools install

* tryfix git submodule recursive (git 2.21/2.22 ?)
---
 .travis.yml             | 13 ++-----------
 tests/ci/style_check.sh |  3 ++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e54251c8..7c50c68de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: bash
 os: linux
-dist: trusty
+dist: bionic
 
 git:
   depth: 1
@@ -80,17 +80,13 @@ jobs:
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
       install:
-        - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo apt-get update -q
-        - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
         - sudo apt-get install valgrind lcov
-      env: CC=gcc-7 CXX=g++-7
 
     - name: "Docs"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
       install:
-          - sudo apt-get install python3-pip
+          - sudo apt-get install python3-pip python3-setuptools
           - pip3 install --user -r doc/requirements.txt;
 
     - name: "Style check"
@@ -101,11 +97,6 @@ jobs:
     - name: "Mock trivial test"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/buildm.sh
-      install:
-        - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo apt-get update -q
-        - sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
-      env: CC=gcc-7 CXX=g++-7
 
     - name: "Mac OSX can build sketches"
       os: osx
diff --git a/tests/ci/style_check.sh b/tests/ci/style_check.sh
index a6b353242..5cba58f9f 100755
--- a/tests/ci/style_check.sh
+++ b/tests/ci/style_check.sh
@@ -9,6 +9,7 @@ ${org}/../restyle.sh
 
 # Revert changes which astyle might have done to the submodules,
 # as we don't want to fail the build because of the 3rd party libraries
-git submodule foreach --recursive git reset --hard
+git --version || true
+git submodule foreach --recursive 'git reset --hard'
 
 git diff --exit-code -- $TRAVIS_BUILD_DIR/libraries