summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index bfebbd71..510fb984 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,10 @@ jobs:
39 install: .travis/$JOB install 39 install: .travis/$JOB install
40 script: .travis/$JOB script 40 script: .travis/$JOB script
41 - stage: "Stage 1" 41 - stage: "Stage 1"
42 env: JOB=tox-bootstrapd-docker
43 services: [docker]
44 script: .travis/$JOB
45 - stage: "Stage 1"
42 if: type IN (push, api, cron) 46 if: type IN (push, api, cron)
43 env: JOB=cmake-win32 47 env: JOB=cmake-win32
44 services: [docker] 48 services: [docker]
@@ -61,11 +65,6 @@ jobs:
61 os: osx 65 os: osx
62 install: .travis/$JOB install 66 install: .travis/$JOB install
63 script: .travis/$JOB script 67 script: .travis/$JOB script
64 - stage: "Stage 1"
65 if: type IN (push, api, cron)
66 env: JOB=tox-bootstrapd-docker
67 services: [docker]
68 script: .travis/$JOB
69 - stage: "Stage 2" 68 - stage: "Stage 2"
70 if: type IN (push, api, cron) 69 if: type IN (push, api, cron)
71 env: JOB=cmake-freebsd 70 env: JOB=cmake-freebsd