From 554ffe6a465d025c5777c23d38faf7202e083842 Mon Sep 17 00:00:00 2001
From: Kevin Lingerfelt <kl@buoyant.io>
Date: Wed, 25 Jul 2018 12:32:42 -0700
Subject: [PATCH] Build version tags in CI (#1365)

* Build version tags in CI
* Simplify clean_head method

Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>
---
 .travis.yml | 7 ++++---
 bin/_tag.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 945b922be..38c1e94a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,14 @@ sudo: false
 branches:
   only:
     - master
+    - /^v\d+\.\d+\.[\w-]+$/ # build version tags
 
 stages:
   - name: test
   - name: docker-deploy
-    if: branch = master AND type != pull_request
+    if: type != pull_request
   - name: integration-test
-    if: branch = master AND type != pull_request
+    if: type != pull_request
 
 jobs:
   include:
@@ -144,7 +145,7 @@ jobs:
           (. bin/_gcp.sh ; get_k8s_ctx "$GCP_PROJECT" "$GCP_ZONE" "$GKE_CLUSTER")
         - |
           # Install linkerd cli.
-          version="git-$(git rev-parse --short=8 HEAD)"
+          version="$(CI_FORCE_CLEAN=1 bin/root-tag)"
           image="gcr.io/linkerd-io/cli-bin:$version"
           id=$(docker create $image)
           docker cp "$id:/out/linkerd-linux" "./linkerd"
diff --git a/bin/_tag.sh b/bin/_tag.sh
index ec121526d..59a1cb85d 100644
--- a/bin/_tag.sh
+++ b/bin/_tag.sh
@@ -11,7 +11,7 @@ go_deps_sha() {
 }
 
 clean_head() {
-    git diff-index --quiet HEAD --
+    [ -n "${CI_FORCE_CLEAN:-}" ] || git diff-index --quiet HEAD --
 }
 
 named_tag() {