diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | src/build-data/sonar-project.properties | 8 | ||||
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 2 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 4e646d9c7..92dcf75a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: - CCACHE_MAXSIZE=100M - CCACHE_MAXFILES=1000 - CCACHE_COMPRESS=1 - # SONAR_TOKEN for accessing the SonarQube server + # SONAR_TOKEN for accessing the Sonar server - secure: "VezRbHFg6kllV5WG06M3tG3aHJaC3xrMylJ6RCVbL+uz2JeralVCqV7eIk4fVb9cu83Li+weEa0AJj0wkxpIUJ+vUh5F65L6gSWSbgHP7muOSVsmnEc6KvX4n3av/ZGe4geSmsxqh2pd/2xI1h7KioGRhKeqaZIdjVgWgGJW2iQ=" matrix: @@ -38,7 +38,7 @@ env: - BUILD_MODE="cross-ppc32" - BUILD_MODE="cross-ppc64" - BUILD_MODE="valgrind" - - BUILD_MODE="sonarqube" + - BUILD_MODE="sonar" matrix: # Ignore some problem builds for now @@ -51,7 +51,7 @@ matrix: - os: osx compiler: gcc - # Run docs, lint, bsi, nist, fuzzers, coverage, valgrind, sonarqube, sanitizer, + # Run docs, lint, bsi, nist, fuzzers, coverage, valgrind, sonar, sanitizer, # minimized and non-ARM cross builds on Linux/gcc only. # The sanitizer builds under Clang run the tests very slowly and @@ -68,7 +68,7 @@ matrix: - compiler: clang env: BUILD_MODE="coverage" - compiler: clang - env: BUILD_MODE="sonarqube" + env: BUILD_MODE="sonar" - compiler: clang env: BUILD_MODE="sanitizer" - compiler: clang @@ -119,7 +119,7 @@ cache: - $HOME/.sonar/cache addons: - sonarqube: true + sonarcloud: true coverity_scan: project: diff --git a/src/build-data/sonar-project.properties b/src/build-data/sonar-project.properties index 408210b81..e2ffd3b07 100644 --- a/src/build-data/sonar-project.properties +++ b/src/build-data/sonar-project.properties @@ -4,12 +4,12 @@ sonar.projectKey=botan # this is the name displayed in the SonarQube UI sonar.projectName=Botan sonar.projectVersion=1.0 - + # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. -# Since SonarQube 4.2, this property is optional if sonar.modules is set. -# If not set, SonarQube starts looking for source code from the directory containing +# Since SonarQube 4.2, this property is optional if sonar.modules is set. +# If not set, SonarQube starts looking for source code from the directory containing # the sonar-project.properties file. -sonar.sources=src +sonar.sources=.. # Language, needed for SonarQube < 4.2 sonar.language=cpp diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index 425602e71..66837268a 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -58,7 +58,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -C / -xvjf softhsm2-trusty-bin.tar.bz2 /tmp/softhsm/bin/softhsm2-util --init-token --free --label test --pin 123456 --so-pin 12345678 - elif [ "$BUILD_MODE" = "sonarqube" ]; then + elif [ "$BUILD_MODE" = "sonar" ]; then wget https://sonarqube.com/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index e35315bd3..3f9c15da6 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -96,7 +96,7 @@ def determine_flags(target, target_os, target_cc, cc_bin, use_ccache, root_dir): else: flags += ['--with-openmp'] - if target == 'sonarqube': + if target == 'sonar': make_prefix = [os.path.join(root_dir, 'build-wrapper-linux-x86/build-wrapper-linux-x86-64'), '--out-dir', 'bw-outputs'] test_cmd = ['sonar-scanner', |