From: Martin Matuska <martin@matuska.org>
Date: Wed, 14 Dec 2016 13:00:29 +0000 (+0100)
Subject: Add OSx to Travis CI build
X-Git-Tag: v3.3.0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfa473b87a747924c21ad7c97473871e74fd2643;p=thirdparty%2Flibarchive.git

Add OSx to Travis CI build
---

diff --git a/.travis.yml b/.travis.yml
index 34665e6ed..2fe450732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,19 @@
 language: C
 sudo: required
 dist: trusty
+os:
+  - linux
+  - osx
 compiler:
   - gcc
   - clang
 env:
   - BUILD_SYSTEM=cmake
   - BUILD_SYSTEM=autotools
+before_install:
+  - if [ `uname` = "Darwin" ]; then brew update; fi
 install:
-  - sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev liblzo2-dev
+  - if [ `uname` = "Darwin" ]; then brew install xz lzo lz4; fi
+  - if [ `uname` = "Linux" ]; then sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev liblzo2-dev; fi
 script:
-  - build/ci_build.sh
+  - travis_wait 30 build/ci_build.sh
diff --git a/build/ci_build.sh b/build/ci_build.sh
index ff8ef2dab..291983745 100755
--- a/build/ci_build.sh
+++ b/build/ci_build.sh
@@ -61,7 +61,7 @@ if [ -z "${BUILD_SYSTEM}" ]; then
 	inputerror "Missing type (-t) parameter"
 fi
 if [ -z "${BUILDDIR}" ]; then
-	BUILDDIR="${CURDIR}/BUILD/${BUILD_SYSTEM}"
+	BUILDDIR="${CURDIR}/build_ci/${BUILD_SYSTEM}"
 fi
 mkdir -p "${BUILDDIR}"
 for action in ${ACTIONS}; do