Merging upstream changes of github-release.sh

This commit is contained in:
Jan Wagner 2015-03-17 00:02:39 +01:00
parent 93f9a0b37d
commit f0203f7f52

View file

@ -30,8 +30,8 @@
# This script provides a simple continuous deployment # This script provides a simple continuous deployment
# solution that allows Travis CI to publish a new GitHub # solution that allows Travis CI to publish a new GitHub
# release and upload assets to it whenever an annotated or # release and upload assets to it whenever a tag is pushed:
# signed tag is pushed (git tag -a/-s; git push --tags). # git tag; git push --tags
# #
# It is created as a temporary solution whilst we wait for # It is created as a temporary solution whilst we wait for
# Travis DPL to support GitHub: # Travis DPL to support GitHub:
@ -83,7 +83,7 @@ REPO=$1 && shift
RELEASE=$1 && shift RELEASE=$1 && shift
RELEASEFILES=$@ RELEASEFILES=$@
if ! TAG=`git describe --exact-match --all 2>/dev/null`; then if ! TAG=`git describe --exact-match --tags 2>/dev/null`; then
echo "This commit is not a tag so not creating a release" echo "This commit is not a tag so not creating a release"
exit 0 exit 0
fi fi
@ -98,7 +98,6 @@ if [ "$TRAVIS" = "true" ] && [ "$TRAVIS_TAG" != "$RELEASE" ]; then
exit 1 exit 1
fi fi
TAG=`echo "$TAG" | sed 's/^tags\///'`
if [ "$TAG" != "$RELEASE" ]; then if [ "$TAG" != "$RELEASE" ]; then
echo "Error: The tag ($TAG) does not match the indicated release ($RELEASE)" echo "Error: The tag ($TAG) does not match the indicated release ($RELEASE)"
exit 1 exit 1