ci: Gently abort if tag was already published

serverless · Dec 9, 2019 · 8678e19 · 8678e19
1 parent 1586b13
commit 8678e19
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -156,22 +156,24 @@ jobs:
           if [ -n "$tagName" ]
           then
             git tag v$tagName
-            git push https://$GITHUB_TOKEN@github.com/serverless/serverless --tags
-            if [ $TRAVIS_BRANCH = master ]
+            if git push https://$GITHUB_TOKEN@github.com/serverless/serverless --tags
             then
-              # Ensure `release-fast-track` branch points latest release
-              git push -f https://$GITHUB_TOKEN@github.com/serverless/serverless master:release-fast-track
-            elif [ $TRAVIS_BRANCH = release-fast-track ]
-            then
-              # Fast forward to `master`
-              git fetch --unshallow
-              git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-              git fetch origin master
-              git checkout -b rebase-target
-              git rebase origin/master
-              git checkout master
-              git merge rebase-target
-              git push https://$GITHUB_TOKEN@github.com/serverless/serverless
+              if [ $TRAVIS_BRANCH = master ]
+              then
+                # Ensure `release-fast-track` branch points latest release
+                git push -f https://$GITHUB_TOKEN@github.com/serverless/serverless master:release-fast-track
+              elif [ $TRAVIS_BRANCH = release-fast-track ]
+              then
+                # Fast forward to `master`
+                git fetch --unshallow
+                git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+                git fetch origin master
+                git checkout -b rebase-target
+                git rebase origin/master
+                git checkout master
+                git merge rebase-target
+                git push https://$GITHUB_TOKEN@github.com/serverless/serverless
+              fi
             fi
           fi