1- # Defaults
2- language : cpp
1+ # Use minimal image as base to avoid overriding environment variables.
2+ language : minimal
33os : linux
44dist : xenial
55
@@ -47,7 +47,6 @@ matrix:
4747
4848 - name : " clang-tidy linting"
4949 stage : check
50- language : minimal
5150 addons :
5251 apt :
5352 sources : ['llvm-toolchain-xenial-7', 'ubuntu-toolchain-r-test']
@@ -65,7 +64,6 @@ matrix:
6564
6665 - name : " cppcheck linting"
6766 stage : check
68- language : minimal
6967 addons : { apt: { packages: ['cppcheck'] } }
7068 before_script :
7169 - cppcheck --version
@@ -96,7 +94,7 @@ matrix:
9694 - name : " linux build with GCC 8"
9795 stage : test
9896 addons : &gcc8
99- apt : { sources: ['ubuntu-toolchain-r-test'], packages: ['g++-8', 'lcov', 'python3-setuptools', 'python3-pip'] }
97+ apt : { sources: ['ubuntu-toolchain-r-test'], packages: ['gcc-8', ' g++-8', 'lcov', 'python3-setuptools', 'python3-pip'] }
10098 env : CC=gcc-8 CXX=g++-8
10199 # See https://docs.conan.io/en/latest/integrations/travisci.html
102100 install :
@@ -105,7 +103,7 @@ matrix:
105103
106104 - name : " linux build with GCC 8"
107105 stage : test
108- addons : { apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['g++-8', 'python3-setuptools', 'python3-pip'] } }
106+ addons : { apt: { sources: ['ubuntu-toolchain-r-test'], packages: ['gcc-8', ' g++-8', 'python3-setuptools', 'python3-pip'] } }
109107 env : CC=gcc-8 CXX=g++-8
110108 install :
111109 - pip3 install conan
@@ -116,6 +114,7 @@ matrix:
116114 - name : " Windows GCC builds"
117115 stage : test
118116 os : windows
117+ language : cpp
119118 compiler : gcc
120119 env :
121120 # - CMAKE_GENERATOR_OVERRIDE="Visual Studio 15 2017 Win64"
0 commit comments