summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml22
1 files changed, 13 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 03c8e4c613..908330a0a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,35 +8,39 @@ os:
- linux
- osx
+osx_image: xcode10.1
+
compiler:
- clang
- gcc
matrix:
include:
- - env: jobname=GIT_TEST_GETTEXT_POISON
+ - env: jobname=linux-gcc-default
os: linux
compiler:
addons:
before_install:
- - env: jobname=Windows
+ - env: jobname=linux-gcc-4.8
+ os: linux
+ dist: trusty
+ compiler:
+ - env: jobname=Linux32
os: linux
compiler:
addons:
+ services:
+ - docker
before_install:
- script:
- - >
- test "$TRAVIS_REPO_SLUG" != "git/git" ||
- ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
- after_failure:
- - env: jobname=Linux32
+ script: ci/run-docker.sh
+ - env: jobname=linux-musl
os: linux
compiler:
addons:
services:
- docker
before_install:
- script: ci/run-linux32-docker.sh
+ script: ci/run-docker.sh
- env: jobname=StaticAnalysis
os: linux
compiler: