eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

don't push *anything* to git if -g is provided to releaseAndroidApps.sh script

Browse Source 
Change-Id: I3b5a1b004f0a7da5861adc49f8cd0b350168ab6d
This commit is contained in:
Axel Uhl
2017-03-23 21:41:10 +01:00
parent fd2b3ab99b
commit 4d567b7475
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration/releaseAndroidApps.sh
+3 -1
View File
@@ -85,7 +85,9 @@ git checkout $ANDROID_RELEASE_BRANCH
git merge -m "Merging $GIT_REMOTE/$ANDROID_RELEASE_BRANCH" $GIT_REMOTE/$ANDROID_RELEASE_BRANCH
git fetch $GIT_REMOTE $RELEASE_BRANCH:$RELEASE_BRANCH
git merge -m "Merging $RELEASE_BRANCH into $ANDROID_RELEASE_BRANCH, probably incorporating version setting to -SNAPSHOT" $GIT_REMOTE/$RELEASE_BRANCH
git push $GIT_REMOTE $ANDROID_RELEASE_BRANCH:$ANDROID_RELEASE_BRANCH
if [ "$PERFORM_GIT_OPERATIONS" = "1" ]; then
git push $GIT_REMOTE $ANDROID_RELEASE_BRANCH:$ANDROID_RELEASE_BRANCH
fi
# Patch the AndroidManifest.xml files to upgrade the android:versionCode sequential counter relevant for the PlayStore
# and the android:versionName which is what the user sees and which we expect to follow a major.minor version scheme,