summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index d5d8b06375..ea684fd555 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ cache:
7sudo: required 7sudo: required
8dist: trusty 8dist: trusty
9 9
10os:
11 - linux
12 - osx
13
14env: 10env:
15 global: 11 global:
16 - MAKEFLAGS="-j5 -rR" 12 - MAKEFLAGS="-j5 -rR"
@@ -20,6 +16,9 @@ env:
20 16
21jobs: 17jobs:
22 include: 18 include:
19 - os: osx
20 env:
21 - BUILDSYSTEM=ninja
23 - env: 22 - env:
24 - os: linux 23 - os: linux
25 - DISTRO=Fedora28-mingw 24 - DISTRO=Fedora28-mingw
@@ -60,6 +59,8 @@ jobs:
60 - DISTRO=Fedora29 59 - DISTRO=Fedora29
61 - CI_BUILD_TYPE=default 60 - CI_BUILD_TYPE=default
62 - BUILDSYSTEM=ninja 61 - BUILDSYSTEM=ninja
62 - os: osx
63 if: type = cron
63 - if: type = cron 64 - if: type = cron
64 env: 65 env:
65 - os: linux 66 - os: linux
@@ -89,8 +90,6 @@ jobs:
89 - os: linux 90 - os: linux
90 - DISTRO=Debian96 91 - DISTRO=Debian96
91 - BUILDSYSTEM=ninja 92 - BUILDSYSTEM=ninja
92 exclude:
93 - os: linux
94 93
95services: 94services:
96 - docker 95 - docker