diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-29 22:12:30 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-29 22:12:30 +0000 |
| commit | 8dd2b4c9840cff4cbe98526f63cabd952ee9b2d3 (patch) | |
| tree | bf381b20e7dff61f9117c2fda1b85e321c3b2e0c | |
| parent | f5935f67a7d03a87a7229fac9faefb6d1851182f (diff) | |
| download | navit-8dd2b4c9840cff4cbe98526f63cabd952ee9b2d3.tar.gz | |
Ensures that libgtk2.0-dev is installed for CircleCI/14.04
| -rw-r--r-- | ci/build_linux.sh | 4 | ||||
| -rw-r--r-- | circle.yml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh index ac9bbbc13..74fe4a136 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -18,4 +18,6 @@ else cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE || exit -1 make || exit -1 fi -cp -r navit/xpm $CIRCLE_ARTIFACTS +if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then + cp -r navit/xpm $CIRCLE_ARTIFACTS +fi diff --git a/circle.yml b/circle.yml index 6965a225e..31ba6d2d7 100644 --- a/circle.yml +++ b/circle.yml @@ -18,6 +18,7 @@ dependencies: - sudo apt-get install libfreetype6-dev - sudo apt-get install libdbus-glib-1-dev - sudo apt-get install g++ + - sudo apt-get install libgtk2.0-dev - bash ci/update_version.sh prepare - bash ci/build_linux.sh - sed -i '/INTEGER/d' bin/po/navit.pot |