summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Beckett <dave@dajobe.org>2014-10-19 09:36:27 -0700
committerDave Beckett <dave@dajobe.org>2014-10-19 09:36:27 -0700
commitfbafea8a1fe0dbd7a28a8d76700c6941b81541a3 (patch)
tree7e4e8f12302c486ea725a25c07e0980068e2660f
parent011057446de566cbdd93d37c9efb00724edf7604 (diff)
downloadraptor-fbafea8a1fe0dbd7a28a8d76700c6941b81541a3.tar.gz
Travis update attempt
-rw-r--r--.travis.yml20
-rwxr-xr-xscripts/install-bison3.sh10
2 files changed, 24 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 98371511..519e0611 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,25 @@
# see
-# http://about.travis-ci.org/docs/user/getting-started/
-# http://about.travis-ci.org/docs/user/languages/c/
-# http://about.travis-ci.org/docs/user/build-configuration/
+# http://docs.travis-ci.com/user/getting-started/
+# http://docs.travis-ci.com/user/languages/c/
+# http://docs.travis-ci.com/user/build-configuration/
+# http://docs.travis-ci.com/user/multi-os/
#
language: c
branches:
only:
- master
+before_script:
+ - [ $TRAVIS_OS_NAME = "linux" ] && ./scripts/install-bison3.sh
before_install:
- - sudo apt-get update -qq
- - sudo apt-get install -qq -y gtk-doc-tools libyajl-dev
+ - [ $TRAVIS_OS_NAME = "linux" ] && sudo apt-get update -qq && sudo apt-get install -qq -y gtk-doc-tools libyajl-dev
+ - [ $TRAVIS_OS_NAME = "osx" ] && brew install bison gtk-doc yajl
compiler:
- gcc
- clang
before_script: ./autogen.sh
-
+os:
+ - linux
+ - osx
+matrix:
+ allow_failures:
+ - os: osx
diff --git a/scripts/install-bison3.sh b/scripts/install-bison3.sh
new file mode 100755
index 00000000..1beb3621
--- /dev/null
+++ b/scripts/install-bison3.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Helper script to install newer bison 3 for travis CI
+
+set -x
+
+V=3.0.2
+
+wget http://ftp.gnu.org/gnu/bison/bison-$V.tar.gz
+tar -x -z -f bison-$V.tar.gz
+cd bison-$V && ./configure --prefix=/usr && make && make install