diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-08-31 14:36:39 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-08-31 14:36:39 -0700 |
| commit | e40d73d4a4405cb1db8beb5691f012899a36c226 (patch) | |
| tree | aafdddc9975baf16ef732316f0ef6b2d572696d8 | |
| parent | 65e4b0ee8bf05f30d658d757d9566b336331f59e (diff) | |
| download | navit-e40d73d4a4405cb1db8beb5691f012899a36c226.tar.gz | |
Updated artifacts for ci v2 / android arm
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | ci/build_android.sh | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index c113e126e..8ec37a936 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,8 @@ jobs: name: Build for Android ARM command: | bash ci/build_android.sh + - store_artifacts: + path: project/android-arm/navit/ build_android_x86: <<: *defaults steps: diff --git a/ci/build_android.sh b/ci/build_android.sh index 2f3a2cb6d..4e5da6e6c 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -31,14 +31,11 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024* make -j $(nproc --all) if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 + make -j $(nproc --all) apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $BUILD_PATH/navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 else - make -j $(nproc --all) apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 + make -j $(nproc --all) apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $BUILD_PATH/navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 fi -[ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/ -cp $BUILD_PATH/navit/*.xml $CIRCLE_ARTIFACTS/android-${ARCH}/ - echo echo "Build leftovers :" ls $BUILD_PATH |