diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-30 22:06:12 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-30 22:06:12 +0000 |
| commit | 58985225ba09cd8fb77a7f51ec225536c6070e1c (patch) | |
| tree | a8b2c2acdce9e7ef8de3e8df9754a6d9fcb9720f | |
| parent | 5b879f94ebdc1232f73eac650b70270a2916ae2a (diff) | |
| download | navit-CI_trusty.tar.gz | |
Process translation template update as part of the linux buildCI_trusty
| -rw-r--r-- | ci/build_linux.sh | 13 | ||||
| -rw-r--r-- | circle.yml | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 1e8560b8b..3a28eb037 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -1,12 +1,15 @@ sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev +cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE" + 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 mkdir bin && cd bin - cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE + cov-build --dir cov-int cmake ../ ${cmake_opts} cov-build --dir cov-int make || exit -1 tar czvf navit.tgz cov-int @@ -16,9 +19,15 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \ https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME + + # Then update the translation template on launchpad + sed -i '/INTEGER/d' bin/po/navit.pot + cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ + 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=@bin/po/navit.pot | grep title + else mkdir bin && cd bin - cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE|| exit -1 + cmake ../ ${cmake_opts} || exit -1 make || exit -1 fi diff --git a/circle.yml b/circle.yml index d62805e54..04470f87e 100644 --- a/circle.yml +++ b/circle.yml @@ -12,10 +12,6 @@ dependencies: - "[ -d ~/android ] || mkdir ~/android" - sudo apt-get update - bash ci/update_version.sh prepare -# - bash ci/build_linux.sh -# - sed -i '/INTEGER/d' bin/po/navit.pot -# - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ -# - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || 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=@bin/po/navit.pot | grep title" # Android build - sudo apt-get install gettext - sudo apt-get install libsaxonb-java |