summaryrefslogtreecommitdiffstats
path: root/scripts/mac
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-17 16:40:35 -0800
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-11-18 16:17:40 +0100
commite6435892336fe579777bd268296e4a8461899051 (patch)
tree65f1f694ef36ce3f5b012badaef53a5f73657ce6 /scripts/mac
parentcd9805904a7d3b941d25ccedb642dfe1f0e49ce9 (diff)
downloadsubsurface-e6435892336fe579777bd268296e4a8461899051.tar.gz
Travis: setup up the desired release message right away
Instead of using the default release message and then trying to fix it up in the after_success section of one of the builds that we test, let's just always use the message that we want, regardless which build finishes first. This currently requires my fork of the uploadtool - the changes have been submitted upstream and I hope they'll get merged there so we can switch back to the upstream version of uploadtool. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/mac')
-rw-r--r--scripts/mac/after_success.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/mac/after_success.sh b/scripts/mac/after_success.sh
index 953b66a65..2636ae899 100644
--- a/scripts/mac/after_success.sh
+++ b/scripts/mac/after_success.sh
@@ -4,10 +4,8 @@ if [ ! -z $TRAVIS_BRANCH ] && [ "$TRAVIS_BRANCH" != "master" ] ; then
export UPLOADTOOL_SUFFIX=$TRAVIS_BRANCH
fi
-# same git version magic as in the Makefile
-# for the naming of the app
-export VERSION=$(cd ${TRAVIS_BUILD_DIR}; ./scripts/get-version linux)
-
+# set up the release message to use
+source ${TRAVIS_BUILD_DIR}/scripts/release-message.sh
cd ${TRAVIS_BUILD_DIR}/build
zip -r -y Subsurface-$VERSION.app.zip Subsurface.app
@@ -16,6 +14,6 @@ echo "Submitting the folloing App for continuous build release:"
ls -lh Subsurface-$VERSION.app.zip
# get and run the upload script
-wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+wget -c https://github.com/dirkhh/uploadtool/raw/master/upload.sh
bash ./upload.sh Subsurface-$VERSION.app.zip