diff options
| author | David Gageot <david@gageot.net> | 2015-07-24 16:35:08 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2015-07-24 16:35:08 +0200 |
| commit | 191a847984fe81c93e022e147d77707c52b199bb (patch) | |
| tree | 1d4f6d5e2a760c1828343919a40718a56a69476c | |
| parent | bcd12057b05d26ca3a782720060e75cc42177215 (diff) | |
| download | sonarqube-191a847984fe81c93e022e147d77707c52b199bb.tar.gz sonarqube-191a847984fe81c93e022e147d77707c52b199bb.zip | |
Update travis-utils to v15
| -rwxr-xr-x | travis.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/travis.sh b/travis.sh index 551fa902f68..2fb5d18cc00 100755 --- a/travis.sh +++ b/travis.sh @@ -3,13 +3,14 @@ set -euo pipefail function installTravisTools { - curl -sSL https://raw.githubusercontent.com/sonarsource/travis-utils/v14/install.sh | bash - source /tmp/travis-utils/env.sh + mkdir ~/.local + curl -sSL https://github.com/SonarSource/travis-utils/tarball/v15 | tar zx --strip-components 1 -C ~/.local + source ~/.local/bin/install } function prepareIts { installTravisTools - travis_start_xvfb + start_xvfb } case "$JOB" in @@ -23,7 +24,7 @@ POSTGRES) psql -c 'create database sonar;' -U postgres - travis_runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" "" + runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" "" ;; MYSQL) @@ -34,11 +35,11 @@ MYSQL) mysql -e "GRANT ALL ON sonar.* TO 'sonar'@'localhost';" -uroot mysql -e "FLUSH PRIVILEGES;" -uroot - travis_runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" "sonar" + runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" "sonar" ;; WEB) - export DISPLAY=:99.0 + prepareIts /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 wget http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar nohup java -jar selenium-server-standalone-2.46.0.jar & @@ -96,8 +97,4 @@ ITS_PLUGINS) mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="plugins" -Dmaven.test.redirectTestOutputToFile=false ;; -*) - echo "Invalid JOB choice [$JOB]" - exit 1 - esac |