summaryrefslogtreecommitdiff
path: root/.circleci
diff options
context:
space:
mode:
authorPierre GRANDIN <pgrandin@users.noreply.github.com>2018-04-25 09:09:22 -0700
committerGitHub <noreply@github.com>2018-04-25 09:09:22 -0700
commita112437440b704677d5258e6ef03b50b8f9ea2cd (patch)
tree4d3163981b49512902c83f59214767826f7208dd /.circleci
parent9b94d287623029adeb88e12c3464037026cec337 (diff)
downloadnavit-a112437440b704677d5258e6ef03b50b8f9ea2cd.tar.gz
Update:CI:us pre-built docker image for android toolchain (#539)
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml22
1 files changed, 4 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7373bbf7..8cf0cb352 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,18 +38,11 @@ jobs:
- store_artifacts:
path: /root/project/doc
build_android_arm:
- <<: *defaults
+ docker:
+ - image: navit/android
steps:
- checkout
- run:
- name: Setup common requirements
- command: |
- bash ci/setup_common_requirements.sh
- - run:
- name: Prepare the Android build environment
- command: |
- bash ci/setup_android.sh
- - run:
name: Build for Android ARM
command: |
bash ci/build_android.sh
@@ -60,18 +53,11 @@ jobs:
command: |
bash ci/update_download_center.sh
build_android_x86:
- <<: *defaults
+ docker:
+ - image: navit/android
steps:
- checkout
- run:
- name: Setup common requirements
- command: |
- bash ci/setup_common_requirements.sh
- - run:
- name: Prepare the Android build environment
- command: |
- bash ci/setup_android.sh
- - run:
name: Build for Android X86
command: |
bash ci/build_android_x86.sh