summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders F Björklund <anders.f.bjorklund@gmail.com>2018-04-01 09:39:15 +0200
committerJoel Rosdahl <joel@rosdahl.net>2018-04-23 21:51:15 +0200
commit564aafed9dec81c9bc3b4430fc0097b5def67abf (patch)
treeb12938b0718135f9d962aca46596da0d2f0eefb4
parentcf517591008206020d39e13ec45667ddf6bdae92 (diff)
downloadccache-564aafed9dec81c9bc3b4430fc0097b5def67abf.tar.gz
Improve the Travis build matrix
Run in containers where possible, save the installations for the targets that actually need to do them (currently: mingw and cuda)
-rw-r--r--.travis.yml25
1 files changed, 14 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index a4793bb8..7cb987ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,11 @@
language: c
-sudo: required
-
addons:
apt:
packages:
- gperf
- elfutils
- zlib1g-dev
- - mingw32
- - mingw32-binutils
- - clang # scan-build
os:
- linux
@@ -22,9 +17,13 @@ compiler:
matrix:
include:
-# - os: linux
-# compiler: i586-mingw32msvc-gcc
-# env: HOST="--host=i586-mingw32msvc" TEST="test/main.exe"
+ - os: linux
+ compiler: i686-w64-mingw32-gcc
+ env: HOST="--host=i686-w64-mingw32" TEST="unittest/run.exe"
+ addons:
+ apt:
+ packages:
+ - gcc-mingw-w64-i686
- os: linux
compiler: clang
env: CFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
@@ -34,17 +33,21 @@ matrix:
- os: linux
compiler: clang
env: PATH="/usr/bin:$PATH" TEST=analyze
+ addons:
+ apt:
+ packages:
+ - clang # scan-build
- os: linux
compiler: gcc
env: CUDA=8.0.61-1
+ sudo: required
+ before_install:
+ - source ./.travis/install_cuda.sh
exclude:
- os: osx
compiler: gcc
-before_install:
- - source ./.travis/install_cuda.sh
-
script:
- ./autogen.sh
- ./configure $HOST