From 4778a409a087a66f95bed026fbc7d0e3d3df8da6 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Tue, 11 Jul 2017 10:38:47 +1000 Subject: [PATCH] Resolve git branch if not supplied --- .travis.yml | 2 +- etc/scripts/tag-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a5a36311..16d370fa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - ./gradlew build jacocoTestReport after_success: - bash <(curl -s https://codecov.io/bash) - - GIT_BRANCH=$TRAVIS_BRANCH etc/scripts/tag-release.sh + - etc/scripts/tag-release.sh #deploy: # provider: releases # api_key: diff --git a/etc/scripts/tag-release.sh b/etc/scripts/tag-release.sh index b6c5e82b0..61d3c18e0 100755 --- a/etc/scripts/tag-release.sh +++ b/etc/scripts/tag-release.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -GIT_BRANCH=${GIT_BRANCH:-$(git rev-parse --abbrev-ref HEAD)} +GIT_BRANCH=${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)} [[ $GIT_BRANCH =~ ^release ]] && ./gradlew -Pbintray_user=$BINTRAY_USER -Pbintray_key=$BINTRAY_KEY release bintrayUpload $@ \ No newline at end of file