summaryrefslogtreecommitdiff
path: root/ci/build_linux.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/build_linux.sh')
-rw-r--r--ci/build_linux.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 5cbd2039a..7e26d0685 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,4 +1,4 @@
-sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev
+sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev libqt5svg5-dev
cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
@@ -8,8 +8,8 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
- mkdir bin && cd bin
- cov-build --dir cov-int cmake ../ ${cmake_opts}
+ mkdir ~/linux-bin && cd ~/linux-bin
+ cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts}
cov-build --dir cov-int make || exit -1
tar czvf navit.tgz cov-int
@@ -26,11 +26,15 @@ 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 bin && cd bin
- cmake ../ ${cmake_opts} || exit -1
+ mkdir ~/linux-bin && cd ~/linux-bin
+ cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts} || exit -1
make || exit -1
fi
if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
cp -r navit/xpm $CIRCLE_ARTIFACTS
fi
+
+
+# Done with the builds tests. Running some app tests
+bash ~/navit/ci/run_linux_tests.sh