diff options
| author | David Gageot <david@gageot.net> | 2015-06-16 14:15:05 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2015-06-16 14:15:05 +0200 |
| commit | 0bff4562138c97e0bafd5578c0052b49e902b8e8 (patch) | |
| tree | 7c2f01b8a6e0d7ee87715eef4ccb6810dac245b5 | |
| parent | 9883b21b72dd1993aba6d2d8df44b19854408431 (diff) | |
| download | sonarqube-0bff4562138c97e0bafd5578c0052b49e902b8e8.tar.gz sonarqube-0bff4562138c97e0bafd5578c0052b49e902b8e8.zip | |
Use Version 2 of TravisCI toolbelt
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b3ab2939fe7..0269e61eacf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: java -sudo: false install: true jdk: @@ -16,6 +15,7 @@ script: cache: directories: - '$HOME/.m2/repository' + before_cache: - 'rm -rf $HOME/.m2/repository/org/codehaus/sonar' diff --git a/travis.sh b/travis.sh index ca72dbb82b9..f79476ee6f7 100755 --- a/travis.sh +++ b/travis.sh @@ -3,8 +3,7 @@ set -euo pipefail function installTravisTools { - curl -sSL https://raw.githubusercontent.com/dgageot/travis-utils/v1/install.sh | sh - source /tmp/travis-utils/utils.sh + curl -sSL https://raw.githubusercontent.com/dgageot/travis-utils/v2/install.sh | bash } case "$DATABASE" in @@ -18,7 +17,7 @@ POSTGRES) psql -c 'create database sonar;' -U postgres - runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" '' + travis_runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" '' ;; MYSQL) @@ -29,7 +28,7 @@ MYSQL) mysql -e "GRANT ALL ON sonar.* TO 'sonar'@'localhost';" -uroot mysql -e "FLUSH PRIVILEGES;" -uroot - runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" 'sonar' + travis_runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" 'sonar' ;; *) |