Merge pull request #72 from broadinstitute/dp-trs-build

stop git tagging non-master branches on github staging / dockstore
broadinstitute · May 15, 2020 · 384873d · 384873d
2 parents 3985f74 + 764a68d
commit 384873d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/travis/github-viral-ngs-staging.sh b/travis/github-viral-ngs-staging.sh
@@ -30,10 +30,14 @@ if [ -z "$TRAVIS_PULL_REQUEST_BRANCH" ]; then
 	git add -A -f
 	git diff-index --quiet HEAD || git commit -q -m "CI push github.com/broadinstitute/viral-pipelines:$VERSION"
 
-	git tag $VERSION
-	git push origin --tags
+	if [[ "$TRAVIS_BRANCH" == "master" ]]; then
+		# for dockstore, don't bother tagging every branch commit that is non-master -- just git push the branch instead
+		git tag $VERSION
+		git push origin --tags
+	fi
 
 	if [ -z "$TRAVIS_TAG" ]; then
+		# if TRAVIS_TAG is set, skip this, since a separate Travis build is already pushing master branch anyway
 		git push -f -u origin $TRAVIS_BRANCH
 	fi