From 5caa9ce4d9c674a0460f77ef1192cbda9cb76aaa Mon Sep 17 00:00:00 2001
From: Pierre GRANDIN <pgrandin@users.noreply.github.com>
Date: Sat, 16 Sep 2017 16:32:11 -0700
Subject: Coverity upgrade (#313)

* Switching to a pre-built image to build Tomtom builds

* Archive less artifacts for Tomtom builds

* Ensures that the /output directory for build artefacts exists

* Updated coverity tools version

* Run coverity report for the coverity_upgrade branch

* Fixed potential path issues

* Fixed coverity path issues for ci v2

* Fixed tar permission issues for ci v2

* Ensures that curl is installed, needed for coverity

* Run coverity builds only for trunk
---
 ci/build_linux.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'ci/build_linux.sh')

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 061ebd019..14abb7597 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,17 +1,20 @@
 set -e
 
-apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev
+COVERITY_VERSION="2017.07"
+
+apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
 
 cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
 
+mkdir ${CIRCLE_WORKING_DIRECTORY}/linux-bin && cd ${CIRCLE_WORKING_DIRECTORY}/linux-bin
+
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
 	# If we are building the official trunk code, push an update to coverity
-	wget -nv -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
-	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
-	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
+	wget -nv -c -O /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz
+	tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/
+	export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH
 	
-	mkdir ~/linux-bin && cd ~/linux-bin
-	cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts}
+	cov-build --dir cov-int cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts}
 	cov-build --dir cov-int make -j $(nproc --all) || exit -1
 	tar czvf navit.tgz cov-int
 	
@@ -28,7 +31,6 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 	curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@po/navit.pot | grep title
 
 else
-	mkdir ${CIRCLE_WORKING_DIRECTORY}/linux-bin && cd ${CIRCLE_WORKING_DIRECTORY}/linux-bin
 	cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts} || exit -1
 	make -j $(nproc --all) || exit -1
 fi
-- 
cgit v1.2.1