From fecc1c87e46438aad368bb546427c764b3bc5b31 Mon Sep 17 00:00:00 2001
From: nanoric <nanoric@qq.com>
Date: Mon, 15 Apr 2019 05:57:32 -0400
Subject: [PATCH] [Mod] formal travis gcc upgrade

---
 .travis.yml | 51 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2620d6c6..55cf5718 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,16 +50,15 @@ matrix:
         - pip install .
 
     - name: "pip install under Ubuntu: gcc-8"
-      before_install:
-        # C++17
-        - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        - sudo apt-get update -y
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-8
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
       install:
-        # C++17
-        - sudo apt-get install -y gcc-8 g++-8
-        - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
-        - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-8 90
-        - sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-8 90
         # update pip & setuptools
         - python -m pip install --upgrade pip wheel setuptools
         # Linux install script
@@ -67,16 +66,15 @@ matrix:
         - bash ./install.sh
 
     - name: "pip install under Ubuntu: gcc-7"
-      before_install:
-        # C++17
-        - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        - sudo apt-get update -y
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
       install:
-        # C++17
-        - sudo apt-get install -y gcc-7 g++-7
-        - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
-        - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 90
-        - sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-7 90
         # update pip & setuptools
         - python -m pip install --upgrade pip wheel setuptools
         # Linux install script
@@ -119,16 +117,15 @@ matrix:
         - pip install dist/`ls dist`
 
     - name: "sdist install under Ubuntu: gcc-8"
-      before_install:
-        # C++17
-        - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        - sudo apt-get update -y
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
       install:
-        # C++17
-        - sudo apt-get install -y gcc-8 g++-8
-        - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
-        - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-8 90
-        - sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-8 90
         # Linux install script
         - python -m pip install --upgrade pip wheel setuptools
         - pushd /tmp