summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-08-12 15:37:37 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-08-12 15:37:37 +0000
commita7434646230b57faadcca60b280ce3e942389988 (patch)
tree0e9f98eb2acd5d745e5b8674f825ebc128595512 /.travis.yml
parentfb89c03dd2b4c05847b7f3f7eeb965cae2e2087e (diff)
Move OSX to stage 1 of Travis.
This avoids its dependency on FreeBSD.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 67af3416..3bdd3ce4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,12 @@ matrix:
82 script: .travis/$JOB-stage1 script 82 script: .travis/$JOB-stage1 script
83 - stage: "Stage 1" 83 - stage: "Stage 1"
84 if: type IN (push, api, cron) 84 if: type IN (push, api, cron)
85 env: JOB=cmake-osx
86 os: osx
87 install: .travis/$JOB install
88 script: .travis/$JOB script
89 - stage: "Stage 1"
90 if: type IN (push, api, cron)
85 env: JOB=tox-bootstrapd-docker 91 env: JOB=tox-bootstrapd-docker
86 services: [docker] 92 services: [docker]
87 script: .travis/$JOB 93 script: .travis/$JOB
@@ -91,12 +97,6 @@ matrix:
91 sudo: required 97 sudo: required
92 install: .travis/$JOB-stage2 install 98 install: .travis/$JOB-stage2 install
93 script: .travis/$JOB-stage2 script 99 script: .travis/$JOB-stage2 script
94 - stage: "Stage 2"
95 if: type IN (push, api, cron)
96 env: JOB=cmake-osx
97 os: osx
98 install: .travis/$JOB install
99 script: .travis/$JOB script
100 fast_finish: true 100 fast_finish: true
101 101
102cache: 102cache: