Merge pull request #340 from alphagov/update-latest-release-branch

Get Travis to check if the version number matches the tag number
alphagov · Oct 27, 2016 · f6e8d69 · f6e8d69
2 parents 99212c7 + 6d4bb83
commit f6e8d69
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/update-release-branch.sh b/update-release-branch.sh
@@ -10,16 +10,21 @@ set -ex
 if [ "$TRAVIS_REPO_SLUG" == "alphagov/govuk_elements" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
   # get the version from the version file
   VERSION_TAG="$(cat VERSION.txt)"
-  echo "Using the most recent tag: $VERSION_TAG and creating a latest-release branch"
-  git config --global user.email "travis@travis-ci.org"
-  git config --global user.name "Travis CI"
-  set +x
-  git remote add deploy-latest-release https://"${GH_TOKEN}"@github.com/alphagov/govuk_elements.git > /dev/null 2>&1
-  set -x
-  # check the remote has been added
-  git checkout -b latest-release v"$VERSION_TAG"
-  git push --force deploy-latest-release latest-release
-  echo "Pushed latest-release branch to GitHub"
+  # check to make sure the tag doesn't already exist
+  if ! git rev-parse $VERSION_TAG >/dev/null 2>&1; then
+    echo "Using the most recent tag: $VERSION_TAG and creating a latest-release branch"
+    git config --global user.email "travis@travis-ci.org"
+    git config --global user.name "Travis CI"
+    set +x
+    git remote add deploy-latest-release https://"${GH_TOKEN}"@github.com/alphagov/govuk_elements.git > /dev/null 2>&1
+    set -x
+    # check the remote has been added
+    git checkout -b latest-release v"$VERSION_TAG"
+    git push --force deploy-latest-release latest-release
+    echo "Pushed latest-release branch to GitHub"
+  else
+    echo "Not updating the latest-release branch as the tag already exists..."
+  fi
 else
   echo "Not updating the latest-release branch as we're on a branch..."
 fi