From 55112f70bfffd79e97a68f6663131ad7405c3a95 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Thu, 17 Aug 2017 04:57:23 +0200
Subject: travis: use matrix with os-x, add fold commands in log

---
 .travis.yml             | 18 +++++++++++++++---
 dist/linux/travis-ci.sh |  9 ++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8575d75f1..da55c31d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,26 @@
 branches:
   except:
   - appveyor
+
 language: c
-os: linux
-sudo: required
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      services: docker
+    - os: osx
+      osx_image: xcode7.2
+
 install: true
-services: docker
+
 script:
 - ./dist/linux/travis-ci.sh
+
 before_deploy:
 - "echo ready to deploy"
+
 deploy:
   - provider: releases
     skip_cleanup: true
@@ -23,5 +34,6 @@ deploy:
       all_branches: true
   - provider: script
     script: /bin/true
+
 after_deploy:
 - "echo deployed"
diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh
index 7c36f6546..7fe6b6276 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/linux/travis-ci.sh
@@ -1,6 +1,11 @@
 #! /bin/bash
 # This script is executed in the travis-ci environment.
 
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    echo "OS X build not yet supported"
+    exit
+fi
+
 # List of docker images
 
 images=("ghdl/ghdl-tools:ubuntu-mcode"
@@ -69,9 +74,11 @@ wait
 EXITCODE=0;
 t=0; for b in $blds; do
   workdir="../wrk-$t"
-  # Display log
+  # Display log (with travis log folding commands)
   printf "$ANSI_YELLOW[TRAVIS] Print BUILD $t log $ANSI_NOCOLOR\n"
+  echo "travis_fold:start:log-$t"
   cat $workdir/log.log
+  echo "travis_fold:end:log-$t"
 
   # Read the last line of the log
   RESULT="$(tail -1 $workdir/log.log)"
-- 
cgit v1.2.3