From 706768b5b69cca2afc61c7cec0fd2f759a6cfbf6 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Fri, 13 Feb 2015 19:42:07 -0800
Subject: [PATCH] Making sure new docs get built on tags.

A tag is not associated with a branch inherently so
TRAVIS_BRANCH == master is the wrong check.
---
 scripts/merge.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 8036df6f13c1..2c2111a2e0f4 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -23,6 +23,9 @@ if [[ "${TRAVIS_BRANCH}" == "master" ]] && \
        [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
   scripts/update_docs.sh
   scripts/update_wheels_project.sh
+elif [[ -n "${TRAVIS_TAG}" ]]; then
+  echo "Building new docs on a tag."
+  scripts/update_docs.sh
 else
   echo "Not in master on a non-pull request. Doing nothing."
 fi