Simplify g++7 installation (#13)

bsamseth · web-flow · commit 5a32297f8a77 · 2019-02-20T09:24:32.000+01:00
Using Travis's built-in apt functionality rather than manual install.
diff --git a/.travis.yml b/.travis.yml
@@ -1,43 +1,37 @@
 language: cpp
-compiler: gcc
 dist: xenial
 notifications:
   email: false
 
-addons:
-  apt:
-    packages: lcov
+matrix:
+  include:
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - lcov
+            - g++-7
+      env:
+        - CXX_COMPILER="g++-7"
 
 before_install:
-  # C++17
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update -qq
-
-install: 
-  # C++17
-  - sudo apt-get install -qq g++-7
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
-  - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-7 90
-
-  # Install coverals gem for uploading coverage to coveralls.
-  - gem install coveralls-lcov
-
-before_script:
-  - lcov --version
-  - gcov --version
-  - g++ --version
   - PARENTDIR=$(pwd)
-  - mkdir $PARENTDIR/build && cd $PARENTDIR/build
+  - mkdir $PARENTDIR/build
 
-script:
+install: 
   - cd $PARENTDIR/build
-  - cmake -DCMAKE_BUILD_TYPE=Coverage $PARENTDIR
+  - cmake $PARENTDIR -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_CXX_COMPILER=$CXX_COMPILER
   - make
+
+script:
   - make coverage
 
 after_success:
   - cd $PARENTDIR/build
   - lcov --list coverage_out.info.cleaned  # Show test report in travis log.
+  # Install coverals gem for uploading coverage to coveralls.
+  - gem install coveralls-lcov
   - coveralls-lcov coverage_out.info.cleaned  # uploads to coveralls
   - bash <(curl -s https://codecov.io/bash) -f coverage_out.info.cleaned || echo "Codecov did not collect coverage reports"
-
