From 9005a831f41b5e1d07efc9c532ce7ff5b252dc7f Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Fri, 14 Aug 2020 15:21:45 +0300 Subject: [PATCH 1/3] Git will fail to tag if there is a branch with the same name already > error: src refspec 3.5.1 matches more than one https://travis-ci.com/github/xwp/stream/jobs/372078948#L474 --- local/scripts/dist.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/local/scripts/dist.sh b/local/scripts/dist.sh index 0f627bd23..b1e6424b1 100755 --- a/local/scripts/dist.sh +++ b/local/scripts/dist.sh @@ -33,6 +33,8 @@ git commit --allow-empty --message "$COMMIT_MESSAGE" if [ -n "$DIST_TAG" ]; then echo "Tagging a release: $DIST_TAG" git tag --force "$DIST_TAG" + git push --force --set-upstream origin "$DIST_TAG" +else + # Syncing release artifacts for a branch. + git push --force --set-upstream origin "$DIST_BRANCH" fi - -git push --force --set-upstream origin "$DIST_BRANCH" --tags From b8984c31172da45d1aead0273bafc18f307b65c2 Mon Sep 17 00:00:00 2001 From: Geoff Taylor Date: Thu, 27 Aug 2020 17:24:58 -0400 Subject: [PATCH 2/3] Adds remote tag remove to ".travis.yml" --- local/scripts/dist.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/local/scripts/dist.sh b/local/scripts/dist.sh index 0f627bd23..9f4c0c5d2 100755 --- a/local/scripts/dist.sh +++ b/local/scripts/dist.sh @@ -33,6 +33,7 @@ git commit --allow-empty --message "$COMMIT_MESSAGE" if [ -n "$DIST_TAG" ]; then echo "Tagging a release: $DIST_TAG" git tag --force "$DIST_TAG" + git push --delete origin "$DIST_TAG" fi git push --force --set-upstream origin "$DIST_BRANCH" --tags From 18dd1dcbb7ad5269250602325636eaae7b35c484 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Wed, 14 Oct 2020 10:01:50 +0300 Subject: [PATCH 3/3] Maybe --- local/scripts/dist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local/scripts/dist.sh b/local/scripts/dist.sh index b1e6424b1..8621ee857 100755 --- a/local/scripts/dist.sh +++ b/local/scripts/dist.sh @@ -33,7 +33,7 @@ git commit --allow-empty --message "$COMMIT_MESSAGE" if [ -n "$DIST_TAG" ]; then echo "Tagging a release: $DIST_TAG" git tag --force "$DIST_TAG" - git push --force --set-upstream origin "$DIST_TAG" + git push --force --set-upstream origin --tags else # Syncing release artifacts for a branch. git push --force --set-upstream origin "$DIST_BRANCH"