Skip to content

Commit c2468df

Browse files
committed
Enable sonacloud only for ubuntu in travis builds
1 parent 9ee3d59 commit c2468df

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ before_install:
2424
script:
2525
- chmod u+x $TRAVIS_BUILD_DIR/tests/travis/script.sh
2626
- docker run -e TRAVIS_BRANCH -e BUILD_TYPE -e DISTRO -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:$DISTRO /pdalc/tests/travis/script.sh
27-
- sonar-scanner
27+
- if ["$DISTRO" = "ubuntu"]; then sonar-scanner; fi

tests/travis/script.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
gcc --version
44
g++ --version
55

6-
# Download and unzip the sonarcloud build wrapper
7-
cd $CI_PROJECT_DIR
8-
curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
9-
unzip build-wrapper-linux-x86.zip
10-
export SONARCLOUD_DIR=$CI_PROJECT_DIR/build-wrapper-linux-x86
6+
if ["$DISTRO" = "ubuntu"]; then
7+
# Download and unzip the sonarcloud build wrapper
8+
curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
9+
unzip build-wrapper-linux-x86.zip
10+
export SONARCLOUD_DIR=$PWD/build-wrapper-linux-x86
11+
fi
1112

1213
export CI_PROJECT_DIR=/pdalc
1314
export CI_PROJECT_NAME=pdal-c
@@ -17,5 +18,10 @@ rm -rf "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
1718
mkdir -p "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
1819
cd "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
1920
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPDALC_GCC_PARAM_GGC_MIN_HEAPSIZE=8192 "$CI_PROJECT_DIR"
20-
$SONARCLOUD_DIR/build-wrapper-linux-x86-64 --out-dir $CI_PROJECT_DIR/bw-output make
21+
22+
if ["$DISTRO" = "ubuntu"]; then
23+
$SONARCLOUD_DIR/build-wrapper-linux-x86-64 --out-dir $CI_PROJECT_DIR/bw-output make
24+
else
25+
make
26+
fi
2127
make coverage_pdalc

0 commit comments

Comments
 (0)