diff options
| author | David Gageot <david@gageot.net> | 2015-07-20 10:00:46 +0200 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-07-20 12:59:15 +0200 |
| commit | 8f24a793edf5c7e4d8364981a70e25a7161d6fcc (patch) | |
| tree | 7d337e83b83d214860c57e6378bcad231344065c | |
| parent | 73b46e381ff0a7a0b3bc280ac45de592e547513a (diff) | |
| download | sonar-scanner-cli-8f24a793edf5c7e4d8364981a70e25a7161d6fcc.tar.gz sonar-scanner-cli-8f24a793edf5c7e4d8364981a70e25a7161d6fcc.zip | |
Trying to fix the build on jdk7
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Dockerfile | 14 | ||||
| -rwxr-xr-x | travis.sh | 11 |
3 files changed, 7 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index c7f2d88..41efeed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ language: java sudo: false jdk: - - oraclejdk8 - - openjdk7 + - oraclejdk7 install: true script: ./travis.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 2487af2..0000000 --- a/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM maven:3.2-jdk-7 - -RUN apt-get update && apt-get install -y \ - bzip2 \ - vim \ - jq - -ENV TESTS SONARQUBE_SNAPSHOT -ENV PATH ~/.local/bin:$PATH - -WORKDIR /root -CMD ["./travis.sh"] - -ADD . /root/ @@ -3,7 +3,7 @@ set -euo pipefail function installTravisTools { - curl -sSL https://raw.githubusercontent.com/sonarsource/travis-utils/v11/install.sh | bash + curl -sSL https://raw.githubusercontent.com/sonarsource/travis-utils/v12/install.sh | bash source /tmp/travis-utils/env.sh } @@ -11,18 +11,19 @@ case "$TESTS" in CI) installTravisTools + travis_build_green "SonarSource/sonarqube" "master" mvn verify -B -e -V ;; IT-DEV) - cat /etc/hosts - rpm -qa | grep glibc installTravisTools - mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true + travis_build_green "SonarSource/sonarqube" "master" + mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true + cd it - mvn -Dsonar.runtimeVersion="DEV" -DsonarRunner.version="2.5-SNAPSHOT" -Dmaven.test.redirectTestOutputToFile=false install + mvn -DsonarRunner.version="2.5-SNAPSHOT" -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install ;; esac |