summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre GRANDIN <grandinp@altern.org>2015-08-18 16:34:54 -0700
committerPierre GRANDIN <grandinp@altern.org>2015-08-18 16:34:54 -0700
commit2c672a7cb3129c2c41f71711c36a19a2e5612219 (patch)
tree13cf3b5b1ba12927fd468d3d2c57fe03e4df86f3
parent20be5ee0afe2eb745d173c521e7479ba028092f5 (diff)
downloadnavit-2c672a7cb3129c2c41f71711c36a19a2e5612219.tar.gz
Index the android build id on the ci build number
-rw-r--r--ci/build_android.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh
index 255b516bf..728389930 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -130,8 +130,8 @@ mkdir -p $BUILD_PATH
cd $BUILD_PATH
export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
android list targets
-svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68`
-if [[ "$svn_rev" == "" ]]; then svn_rev="6138"; fi # Workaround for git-only builds
+# The value comes from ( last_svn_rev - max_build_id ) at the time of the git migration
+svn_rev=$(( 5658 + $CIRCLE_BUILD_NUM ))
sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt
cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/