diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-11-01 09:35:07 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-11-01 09:35:07 -0700 |
| commit | c1d19c857cfe3922e1c6b9c85e9bbfa144548317 (patch) | |
| tree | 1d158633fc7076a9384d829b901d56176adb6482 | |
| parent | b1cbc462186edd6343e3601856409d40b025b677 (diff) | |
| download | navit-always_build_apk_release.tar.gz | |
change:android:always build apk releasealways_build_apk_release
| -rw-r--r-- | ci/build_android.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index ad42c78c2..bf992fd2c 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -30,12 +30,5 @@ 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 navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 -else - make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 -fi - -echo -echo "Build leftovers :" -find . +make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 +make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1 |