aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Tudor Panu <mihai.tudor.panu@intel.com>2015-12-01 11:56:47 -0800
committerBrendan Le Foll <brendan.le.foll@intel.com>2015-12-02 15:03:30 +0000
commitb1016635c3d3a6dccdeeddce0faae4b1dda0e594 (patch)
treedc957b582ccad24534cf50c38af53c67f734fd9e
parentc7a405a531a89fc8c91a56555e346248ed109862 (diff)
.travis.yml: enabled JAVA 8 builds with gccHEADmaster
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com> Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 670ebdd..89eb5f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,9 @@ install:
- sudo apt-get update -qq
- sudo apt-get install -y -qq swig3.0 python git cmake
- sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
+ - sudo update-java-alternatives -s java-8-oracle
+before_script:
+ - if [ "$CC" = "gcc" ]; then export BUILDJAVA=ON; else export BUILDJAVA=OFF; fi
+ - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
script:
- - mkdir build && cd build && cmake -DNODE_ROOT_DIR:PATH=/home/travis/.nvm/v0.10.36/include .. && make && make test
+ - mkdir build && cd build && cmake -DBUILDSWIGJAVA=$BUILDJAVA -DNODE_ROOT_DIR:PATH=/home/travis/.nvm/v0.10.36/include .. && make && make test