summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Grandin <grandinp@gmail.com>2018-04-22 19:32:02 -0700
committerPierre Grandin <grandinp@gmail.com>2018-04-22 19:32:02 -0700
commit14ff0195fb695952a0b8519863472664d4665d9d (patch)
tree7f1c910ee537cefe9ebc19b300f5a64a8aebfdfe
parentfe7af475a7b2ce4365a89c19ccccb99edec8fa1d (diff)
downloadnavit-use_android_docker_image.tar.gz
Testing a pre-built docker image for android toolchainuse_android_docker_image
-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