Skip to content
Snippets Groups Projects
Commit 7ef88555 authored by Joakim Söderberg's avatar Joakim Söderberg Committed by Andy Green
Browse files

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.
parent d4dd69a2
Branches
Tags
No related merge requests found
...@@ -18,8 +18,7 @@ os: ...@@ -18,8 +18,7 @@ os:
- osx - osx
language: c language: c
install: install:
- sudo apt-get update -qq && sudo apt-get install -y -qq valgrind - ./travis_install.sh
- if [ x$LWS_METHOD == xlibev ] && [ "$COVERITY_SCAN_BRANCH" != 1 ]; then sudo apt-get install -y -qq libev-dev; fi
script: script:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake --build .; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake --build .; fi
addons: addons:
......
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment