Skip to content
Browse files

Update script for making a release

  • Loading branch information...
1 parent 4859a35 commit 1b897beffa40ff8615cdffaa200cc2b9bd30610f @eyedol eyedol committed Jun 19, 2014
Showing with 8 additions and 32 deletions.
  1. +8 −32 release.sh
View
40 release.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# Make a release to the SMSSync app.
+# TODO:: Look into making this a Gradle task
if [[ $# -lt 2 ]]
then
@@ -12,53 +13,28 @@ TAG_NAME=$1
TAG_MESSAGE=$2
DEVELOP='develop'
MASTER='master'
-RELEASE='release'
echo $TAG_MESSAGE
# SMSSync source code
SMSSYNC='smssync'
-# Merge release to master and develop
-
-# Checkout develop branch
-echo "Checking out the develop branch..."
-git checkout $DEVELOP
-
-# Merge release branch into the develop branch
-echo "Merging release branch into develop..."
-git merge $RELEASE
+# Merge develop branch into master
# Checkout master branch
echo "Checking out the master branch..."
git checkout $MASTER
-# Merge release branch into master branch
-echo "Merging release branch into"
-git merge $RELEASE
+# Merge develop branch into master branch
+echo "Merging develop branch into master"
+git merge $DEVELOP
-# Delete the release branch
-echo "Deleting local release branch..."
-git branch -d $RELEASE
-
-# Delete remote release branch
-echo "Deleting remote release branch..."
-git push origin --delete $RELEASE
-
-# Create the release tag
+# Create the signed release tag
echo "Creating release tag $TAG_NAME ..."
-git tag -a $TAG_NAME -m $TAG_MESSAGE
-
-# Push newly created tag to remote host
-echo "Pushing new tag to remote host..."
-git push --tags
-
-# Create the release build
-echo "Changing directory into $SMSSYNC"
-pushd $SMSSYNC
+git tag -s $TAG_NAME -m $TAG_MESSAGE
# Create a release apk
echo "Building a release apk"
-ant clean release
+./gradlew clean assemble
# Back to where we were before
popd

0 comments on commit 1b897be

Please sign in to comment.
Something went wrong with that request. Please try again.