Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/scripts/update-workhorse b/scripts/update-workhorse
index 3ada37e70a1..2c43b249fe4 100755
--- a/scripts/update-workhorse
+++ b/scripts/update-workhorse
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 WORKHORSE_DIR=workhorse/
-WORKHORSE_REF="v$(cat GITLAB_WORKHORSE_VERSION)"
+WORKHORSE_REF="$(cat GITLAB_WORKHORSE_VERSION)"
 WORKHORSE_URL=${GITLAB_WORKHORSE_URL:-https://gitlab.com/gitlab-org/gitlab-workhorse.git}
 
 if [ $# -gt 1 ] || ([ $# = 1 ] && [ x$1 != xcheck ]); then
@@ -9,6 +9,11 @@ if [ $# -gt 1 ] || ([ $# = 1 ] && [ x$1 != xcheck ]); then
   exit 1
 fi
 
+if echo "$WORKHORSE_REF" | grep -q '^[0-9]\+\.[0-9]\+\.[0-9]\+' ; then
+  # Assume this is a tagged release
+  WORKHORSE_REF="v${WORKHORSE_REF}"
+fi
+
 clean="$(git status --porcelain)"
 if [ -n "$clean" ] ; then
   echo 'error: working directory is not clean:'