From e7b9733171835e0a91155589318fdd08b1c68113 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Thu, 18 Jan 2018 13:21:34 -0500 Subject: Move Sonar config from build-data to configs Since it is not a template file, nor is it read by configure.py --- src/build-data/sonar-project.properties | 16 ---------------- src/configs/sonar-project.properties | 16 ++++++++++++++++ src/scripts/ci_build.py | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 src/build-data/sonar-project.properties create mode 100644 src/configs/sonar-project.properties diff --git a/src/build-data/sonar-project.properties b/src/build-data/sonar-project.properties deleted file mode 100644 index 574c19051..000000000 --- a/src/build-data/sonar-project.properties +++ /dev/null @@ -1,16 +0,0 @@ -sonar.host.url=https://sonarcloud.io - -sonar.organization=randombit-github -sonar.projectKey=botan - -sonar.projectName=Botan -sonar.sources=src -sonar.language=cpp -sonar.cpp.file.suffixes=.cpp,.h -sonar.cfamily.build-wrapper-output=bw-outputs -sonar.sourceEncoding=UTF-8 - -# Sonar thinks these are duplicates -sonar.exclusions=build/include/botan/*.h,build/include/botan/internal/*.h,build/include/external/*.h - -sonar.cfamily.llvm-cov.reportPath=build/cov_report.txt diff --git a/src/configs/sonar-project.properties b/src/configs/sonar-project.properties new file mode 100644 index 000000000..574c19051 --- /dev/null +++ b/src/configs/sonar-project.properties @@ -0,0 +1,16 @@ +sonar.host.url=https://sonarcloud.io + +sonar.organization=randombit-github +sonar.projectKey=botan + +sonar.projectName=Botan +sonar.sources=src +sonar.language=cpp +sonar.cpp.file.suffixes=.cpp,.h +sonar.cfamily.build-wrapper-output=bw-outputs +sonar.sourceEncoding=UTF-8 + +# Sonar thinks these are duplicates +sonar.exclusions=build/include/botan/*.h,build/include/botan/internal/*.h,build/include/external/*.h + +sonar.cfamily.llvm-cov.reportPath=build/cov_report.txt diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 3a462fdb5..beb9622c1 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -449,7 +449,7 @@ def main(args=None): cmds.append(['llvm-cov', 'show', './botan-test', '-instr-profile=botan.profdata', '>', 'build/cov_report.txt']) - sonar_config = os.path.join(root_dir, os.path.join(root_dir, 'src/build-data/sonar-project.properties')) + sonar_config = os.path.join(root_dir, os.path.join(root_dir, 'src/configs/sonar-project.properties')) cmds.append(['sonar-scanner', '-Dproject.settings=%s' % (sonar_config), '-Dsonar.login=$SONAR_TOKEN']) -- cgit v1.2.3