diff --git a/.travis.yml b/.travis.yml index 947ec85c4ed78f4eea0b9ee5eb17bfdae5074228..083a4948bfcbbb6248f96a601c1d9c6ac16d396b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,40 +63,39 @@ matrix: - compiler: gcc language: java jdk: oraclejdk7 - env: BINDINGS=java M2_HOME=/tmp + env: BINDINGS=java - compiler: clang language: java jdk: oraclejdk7 - env: BINDINGS=java CC=clang M2_HOME=/tmp + env: BINDINGS=java CC=clang - compiler: gcc language: java jdk: openjdk7 - env: BINDINGS=java M2_HOME=/tmp + env: BINDINGS=java - compiler: clang language: java jdk: openjdk7 - env: BINDINGS=java CC=clang M2_HOME=/tmp + env: BINDINGS=java CC=clang - compiler: gcc language: java jdk: openjdk6 - env: BINDINGS=java M2_HOME=/tmp + env: BINDINGS=java - compiler: clang language: java jdk: openjdk6 - env: BINDINGS=java CC=clang M2_HOME=/tmp + env: BINDINGS=java CC=clang before_install: - sudo apt-get update -qq - if [ "$BINDINGS" != "none" ]; then sudo apt-get install -qq swig; fi - if [ "$BINDINGS" == "perl" ]; then sudo add-apt-repository ppa:dns/irc -y; sudo apt-get update -qq; sudo apt-get install -qq swig=2.0.8-1irc1~12.04; fi - if [ "$BINDINGS" == "python" ]; then sudo apt-get install -qq python-dev; fi - if [ "$BINDINGS" == "dotnet" ]; then sudo add-apt-repository ppa:directhex/monoxide -y; sudo apt-get update -qq; sudo apt-get install -qq mono-devel mono-mcs nunit nunit-console; mozroots --import --sync; fi - - if [ "$BINDINGS" == "java" ]; then mkdir $M2_HOME/conf; cp settings.xml $M2_HOME/conf/; fi install: true before_script: - if [ "$BINDINGS" == "php" ]; then phpenv config-add src/bindings/php/hammer.ini; fi script: - - scons bindings=$BINDINGS test + - if [ "$BINDINGS" == "java" ]; then sudo scons bindings=$BINDINGS test; else scons bindings=$BINDINGS test; fi notifications: irc: channels: diff --git a/settings.xml b/settings.xml deleted file mode 100644 index 59b32dc335bd042d9ca4a2c2016822789fbb9654..0000000000000000000000000000000000000000 --- a/settings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 - http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <localRepository>/tmp/.m2/repository</localRepository> -</settings>