Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit fbc9707

Browse files
author
ingvord
committed
integrate sonar [0,5h]
1 parent 0d8f441 commit fbc9707

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ before_install:
3232
- git clone https://github.com/JoakimSoderberg/coveralls-cmake.git
3333
- git clone -b v4.2.2 https://${CI_USER_TOKEN}@github.com/zeromq/cppzmq.git cppzmq
3434
- git clone -b tango-9-lts https://${CI_USER_TOKEN}@github.com/tango-controls/tango-idl.git idl
35+
- wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip && unzip build-wrapper-linux-x86.zip
3536

3637
before_script:
3738
- docker run --name mysql_db -e MYSQL_ROOT_PASSWORD=root -d tangocs/mysql:9.2.2 --sql-mode=""
3839
- CONTAINER=$(docker run --name tango_cs -e TANGO_HOST=127.0.0.1:10000 -e MYSQL_HOST=mysql_db:3306 -e MYSQL_USER=tango -e MYSQL_PASSWORD=tango -e MYSQL_DATABASE=tango --link mysql_db:mysql_db -d tangocs/tango-cs:latest)
3940
- IPADDR=$(docker inspect -f '{{ .NetworkSettings.IPAddress }}' $CONTAINER)
4041
- TANGO_HOST=${IPADDR}:10000
4142
- docker build --build-arg APP_UID=$(id -u) --build-arg APP_GID=$(id -g) -t cpp_tango .travis/${OS_TYPE}
42-
- docker run --name cpp_tango -e TANGO_HOST=${TANGO_HOST} -e BINTRAY_USER_NAME=tango-ci -e BINTRAY_API_KEY=${CI_BINTRAY_API_KEY} -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} --link tango_cs:tango_cs -v `pwd`:/home/tango/src -v `pwd`/idl:/home/tango/idl -v `pwd`/cppzmq:/home/tango/cppzmq -v `pwd`/coveralls-cmake:/home/tango/coveralls-cmake -dit cpp_tango
43+
- docker run --name cpp_tango -e TANGO_HOST=${TANGO_HOST} -e BINTRAY_USER_NAME=tango-ci -e BINTRAY_API_KEY=${CI_BINTRAY_API_KEY} -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} --link tango_cs:tango_cs -v `pwd`:/home/tango/src -v `pwd`/idl:/home/tango/idl -v `pwd`/cppzmq:/home/tango/cppzmq -v `pwd`/coveralls-cmake:/home/tango/coveralls-cmake -v `pwd`/build-wrapper-linux-x86:/home/tango/build-wrapper-linux-x86 -dit cpp_tango
4344
- .travis/install_tango_idl.sh
4445
- .travis/install_cppzmq.sh
4546
#work around gcov ignored by sonar
@@ -59,7 +60,7 @@ deploy:
5960
on:
6061
tags: true
6162

62-
after-script:
63+
after-scrhttps://sonarcloud.io/static/cpp/build-wrapper-linux-x8664.zipipt:
6364
- docker stop cpp_tango
6465
- docker rm cpp_tango
6566
- docker stop tango_cs

.travis/debian8/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ then
1313
exit -1
1414
fi
1515

16-
docker exec cpp_tango make -C /home/tango/src/build -j 2
16+
docker exec cpp_tango /home/tango/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir /home/tango/src/bw-output make -C /home/tango/src/build -j 2

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sonar.sources=cppapi
1919

2020
sonar.sourceEncoding=UTF-8
2121

22-
sonar.cfamily.build-wrapper-output.bypass=true
22+
sonar.cfamily.build-wrapper-output=bw-output
2323
sonar.cfamily.threads=2
2424
sonar.cfamily.gcov.reportsPath=build
2525

0 commit comments

Comments
 (0)