From 85399c1eee25aeb020cb2befa20bde3399173f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Galland?= Date: Thu, 16 Feb 2017 08:29:34 +0100 Subject: [PATCH] [ci] Reactivate the Linux compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Galland --- .travis.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0af8ecba3..3f84d2bbd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,25 +9,25 @@ matrix: fast_finish: true include: -# - os: linux -# jdk: oraclejdk8 -# addons: -# apt: -# packages: -# - xvfb -# - lib32z1 -# - lib32ncurses5 -# - genisoimage -# before_install: -# - "sh -e ./build-tools/scripts/travis-download-maven.sh" -# - export M2_HOME=$HOME/.binaries/apache-maven-3.3.9 -# - export PATH=$M2_HOME/bin:$PATH -# - mvn -Xmx32m --version -# - "export DISPLAY=:99.0" -# - "sh -e /etc/init.d/xvfb start" -# - sleep 3 # give xvfb some time to start -# - echo "MAVEN_OPTS=\"$MAVEN_OPTS -XX:+CMSClassUnloadingEnabled -Xmx3g\"" > $HOME/.mavenrc -# env: DISPLAY=:99.0 + - os: linux + jdk: oraclejdk8 + addons: + apt: + packages: + - xvfb + - lib32z1 + - lib32ncurses5 + - genisoimage + before_install: + - "sh -e ./build-tools/scripts/travis-download-maven.sh" + - export M2_HOME=$HOME/.binaries/apache-maven-3.3.9 + - export PATH=$M2_HOME/bin:$PATH + - mvn -Xmx32m --version + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start + - echo "MAVEN_OPTS=\"$MAVEN_OPTS -XX:+CMSClassUnloadingEnabled -Xmx3g\"" > $HOME/.mavenrc + env: DISPLAY=:99.0 - os: osx osx_image: xcode8.2 # see https://docs.travis-ci.com/user/osx-ci-environment/