From de751c994a77185e43b1d4c5135bd22181b09e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B6derberg?= Date: Thu, 11 Dec 2014 17:49:31 +0100 Subject: [PATCH] Attempt at fixing Travis for OSX. Move install into external shell script. We cannot use apt-get on OSX, use brew instead... Also valgrind isn't used at the moment so skip intalling it. --- .travis.yml | 3 +-- travis_install.sh | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100755 travis_install.sh diff --git a/.travis.yml b/.travis.yml index 88d5901d6..13d5453d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,7 @@ os: - osx language: c install: - - sudo apt-get update -qq && sudo apt-get install -y -qq valgrind - - if [ x$LWS_METHOD == xlibev ] && [ "$COVERITY_SCAN_BRANCH" != 1 ]; then sudo apt-get install -y -qq libev-dev; fi + - ./travis_install.sh script: - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake --build .; fi addons: diff --git a/travis_install.sh b/travis_install.sh new file mode 100755 index 000000000..96ac72d97 --- /dev/null +++ b/travis_install.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ "$COVERITY_SCAN_BRANCH" == 1 ]; then exit; fi + +if [ "$TRAVIS_OS_NAME" == "linux" ]; +then + sudo apt-get update -qq + + if [ "$LWS_METHOD" == "libev" ]; + then + sudo apt-get install -y -qq libev-dev; + fi +fi + +if [ "$TRAVIS_OS_NAME" == "osx" ]; +then + if [ "$LWS_METHOD" == "libev" ]; + then + brew install libev; + fi +fi + +