diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-12-04 00:21:15 -0800 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2017-12-04 09:21:15 +0100 |
| commit | d0d48666cb1dcfe53a1649e1153bbf884951a9c1 (patch) | |
| tree | f8d02030d1be82ae7e56a5ae89c5c57000454d8f | |
| parent | 3f9baceac03c592015d1609b29da7669687dab63 (diff) | |
| download | navit-d0d48666cb1dcfe53a1649e1153bbf884951a9c1.tar.gz | |
improve:ci:improved linux builds (#382)
* Standardize path wrt android build
* Setup requirements in a seperate step, enhance readability of build output
* Moved linux deps install to another step
| -rw-r--r-- | .circleci/config.yml | 7 | ||||
| -rw-r--r-- | ci/build_linux.sh | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 19cb6286d..b2a27c13e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,10 +9,13 @@ jobs: steps: - checkout - run: - name: Build for Linux + name: Setup requirements command: | bash ci/setup_common_requirements.sh - bash ci/build_linux.sh + apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl + - run: + name: Build for Linux + command: bash ci/build_linux.sh run_doxygen: <<: *defaults steps: diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 14abb7597..4105cc1d7 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -1,12 +1,13 @@ +#!/bin/bash set -e COVERITY_VERSION="2017.07" - -apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl +BUILD_PATH="linux" 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 +[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH +pushd $BUILD_PATH if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then # If we are building the official trunk code, push an update to coverity @@ -14,7 +15,7 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun 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 - cov-build --dir cov-int cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts} + cov-build --dir cov-int cmake ${cmake_opts} ../ cov-build --dir cov-int make -j $(nproc --all) || exit -1 tar czvf navit.tgz cov-int @@ -31,7 +32,7 @@ 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 - cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts} || exit -1 + cmake ${cmake_opts} ../ || exit -1 make -j $(nproc --all) || exit -1 fi |