From e6435892336fe579777bd268296e4a8461899051 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 17 Nov 2017 16:40:35 -0800 Subject: 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 --- scripts/mac/after_success.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts/mac') 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 -- cgit v1.2.3-70-g09d2