diff options
| author | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 19:40:00 +0000 |
|---|---|---|
| committer | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-07-31 19:40:00 +0000 |
| commit | d88f4060a402b2851cd82dc1f43639f91df47a19 (patch) | |
| tree | 4f672642c1e18eff37cc2f04fa05777c85b1320a | |
| parent | dd131f08e949c9d1f58a664f0965e64d7f63b40f (diff) | |
| download | navit-svn-d88f4060a402b2851cd82dc1f43639f91df47a19.tar.gz | |
Update:CI:generate a non debug apk from the master branch
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6130 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | ci/build_android.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index 98936fa8..3d832b09 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -131,10 +131,13 @@ cd $BUILD_PATH export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH android list targets cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DANDROID_API_VERSION=19 $SOURCE_PATH -make && make apkg || exit 1 -mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk +make || exit 1 +if [[ "${CIRCLE_BRANCH}" == "master" ]]; then + make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk +else + make apkg && mv navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk +fi #mv navit/android/bin/Navit-debug-unaligned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug-unaligned.apk -#make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk echo $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-debug.apk |