summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-01-28 12:00:24 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-01-28 12:00:38 -0500
commit8da1d8a8b23bda25063ced339faafb9af26ae2c8 (patch)
treea44fa9f21f8aebe88870c4a4439cab2512c12752 /.travis.yml
parentbe76c3ca47b201a8abaf8caeaf300c3c8b23deb2 (diff)
downloadefl-8da1d8a8b23bda25063ced339faafb9af26ae2c8.tar.gz
ci: travis: enable a meson/ninja build on osx
Summary: This cuts down the time the osx builld takes from ~30min to ~20min Keeping the autotools osx build in the cron job for now. Reviewers: bu5hm4n, zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7799
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:
sudo: required
dist: trusty
-os:
- - linux
- - osx
-
env:
global:
- MAKEFLAGS="-j5 -rR"
@@ -20,6 +16,9 @@ env:
jobs:
include:
+ - os: osx
+ env:
+ - BUILDSYSTEM=ninja
- env:
- os: linux
- DISTRO=Fedora28-mingw
@@ -60,6 +59,8 @@ jobs:
- DISTRO=Fedora29
- CI_BUILD_TYPE=default
- BUILDSYSTEM=ninja
+ - os: osx
+ if: type = cron
- if: type = cron
env:
- os: linux
@@ -89,8 +90,6 @@ jobs:
- os: linux
- DISTRO=Debian96
- BUILDSYSTEM=ninja
- exclude:
- - os: linux
services:
- docker