diff options
author | iphydf <iphydf@users.noreply.github.com> | 2017-01-05 21:23:06 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2017-01-06 00:40:29 +0000 |
commit | 08cd61387ee078b81c50fa2714e9f1534a0865a2 (patch) | |
tree | 63af5fb85aa8d296d7472a65e7f526d6f6f63129 /.travis.yml | |
parent | fdb46f6cf216a866d29402ae991be9c43282dde6 (diff) |
Add an OSX build that doesn't run tests.
This one is not allowed to fail and ensures that toxcore can at least be
built for OSX.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 58d7db21..8716630b 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -2,6 +2,13 @@ language: c | |||
2 | 2 | ||
3 | matrix: | 3 | matrix: |
4 | include: | 4 | include: |
5 | # OSX build comes first because Travis queues builds in order. The OSX | ||
6 | # builds are often pushed on a very long (100-200 jobs) backlog, so they get | ||
7 | # highest priority in our build sequence. | ||
8 | - env: JOB=toxcore ENV=osx RUN_TESTS=false | ||
9 | os: osx | ||
10 | - env: JOB=toxcore ENV=osx RUN_TESTS=true | ||
11 | os: osx | ||
5 | - env: JOB=hstox ENV=linux | 12 | - env: JOB=hstox ENV=linux |
6 | language: haskell | 13 | language: haskell |
7 | ghc: 7.8 | 14 | ghc: 7.8 |
@@ -9,8 +16,6 @@ matrix: | |||
9 | compiler: gcc | 16 | compiler: gcc |
10 | - env: JOB=toxcore ENV=linux | 17 | - env: JOB=toxcore ENV=linux |
11 | compiler: clang | 18 | compiler: clang |
12 | - env: JOB=toxcore ENV=osx | ||
13 | os: osx | ||
14 | - env: JOB=toxcore ENV=windows ARCH=i686 | 19 | - env: JOB=toxcore ENV=windows ARCH=i686 |
15 | services: | 20 | services: |
16 | - docker | 21 | - docker |
@@ -19,7 +24,7 @@ matrix: | |||
19 | - docker | 24 | - docker |
20 | fast_finish: true | 25 | fast_finish: true |
21 | allow_failures: | 26 | allow_failures: |
22 | - os: osx | 27 | - env: JOB=toxcore ENV=osx RUN_TESTS=true |
23 | 28 | ||
24 | addons: | 29 | addons: |
25 | apt: | 30 | apt: |