diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-09-30 13:50:19 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-09-30 13:57:32 +0300 |
| commit | c7e08ddccb34949128a1a7906bdc51c950ffbb70 (patch) | |
| tree | 89282f43561f428cba79bb3af3e772a9318c8acc | |
| parent | 3d3883bd816099d3915d662d67c52e0fd24f14cb (diff) | |
travis: improve .travis.yml
| -rw-r--r-- | .travis.yml | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 2a2ce18..4526c2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,18 @@ dist: trusty # Enable C++ support language: cpp +addons: + apt: + sources: &sources + - ubuntu-toolchain-r-test + packages: &packages + - libegl1-mesa-dev + - libgles2-mesa-dev + - libwayland-dev + - libx11-xcb-dev + - libx11-dev + - libgbm-dev + # Need MYCC and MYCXX as travis overwrites CC and CXX matrix: @@ -12,29 +24,29 @@ matrix: - compiler: gcc addons: apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.8', 'libegl1-mesa-dev', 'libgles2-mesa-dev', 'libwayland-dev', 'libx11-xcb-dev', 'libx11-dev', 'libgbm-dev'] + sources: *sources + packages: [*packages, 'g++-4.8'] env: MYCC=gcc-4.8 MYCXX=g++-4.8 - compiler: gcc addons: apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.9', 'libegl1-mesa-dev', 'libgles2-mesa-dev', 'libwayland-dev', 'libx11-xcb-dev', 'libx11-dev', 'libgbm-dev'] + sources: *sources + packages: [*packages, 'g++-4.9'] env: MYCC=gcc-4.9 MYCXX=g++-4.9 - compiler: gcc addons: apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-5', 'libegl1-mesa-dev', 'libgles2-mesa-dev', 'libwayland-dev', 'libx11-xcb-dev', 'libx11-dev', 'libgbm-dev'] + sources: *sources + packages: [*packages, 'g++-5'] env: MYCC=gcc-5 MYCXX=g++-5 - compiler: clang addons: apt: - sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8'] - packages: ['clang-3.8', 'libegl1-mesa-dev', 'libgles2-mesa-dev', 'libwayland-dev', 'libx11-xcb-dev', 'libx11-dev', 'libgbm-dev'] + sources: [*sources, 'llvm-toolchain-precise-3.8'] + packages: [*packages, 'clang-3.8'] env: MYCC=clang-3.8 MYCXX=clang++-3.8 # Build steps |