diff options
| author | Bignaux Ronan <ronan@aimao.org> | 2018-09-04 17:35:49 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2018-09-04 17:35:49 +0200 |
| commit | 6710e761cccc0b9180802d89f28fb597709ab303 (patch) | |
| tree | 4573139df34668e870ac7a8b1601abc9281af7eb /.circleci | |
| parent | b9976e0a9357f5dbb31a7544da6d6393d8a013bc (diff) | |
| download | navit-6710e761cccc0b9180802d89f28fb597709ab303.tar.gz | |
Add:circleci:Upgrade linux build image to latest ubuntu LTS (#656)
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 877ff29c9..2df09a96d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 defaults: &defaults docker: - - image: ubuntu:14.04 + - image: ubuntu:18.04 jobs: sanity_check: <<: *defaults @@ -19,12 +19,12 @@ jobs: - checkout - run: name: Id - command: sudo cat /etc/*release + command: cat /etc/*release - run: name: Setup requirements command: | bash scripts/setup_common_requirements.sh - apt-get install -y libpng12-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl + apt-get install -y libpng-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl - run: name: Build for Linux command: bash scripts/build_linux.sh @@ -60,11 +60,12 @@ jobs: - checkout - run: name: Id - command: sudo cat /etc/*release + command: cat /etc/*release - run: - name: Install cmake gettext libsaxonb-java librsvg2-bin + name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config command: | - sudo apt-get install cmake gettext libsaxonb-java librsvg2-bin + sudo apt-get update + sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config cmake ./ -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 - run: name: Process icons @@ -98,7 +99,7 @@ jobs: cd ../ - run: name: Chmod permissions - command: sudo chmod +x ./gradlew + command: chmod +x ./gradlew - run: name: Download Dependencies command: ./gradlew -v @@ -148,7 +149,8 @@ jobs: - store_test_results: path: test-results build_win32: - <<: *defaults + docker: + - image: ubuntu:14.04 steps: - checkout - run: |