From 2a0b97d5ac9210ff1e007c09f578666b57f62649 Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <lo@linux.com>
Date: Sat, 29 Dec 2018 17:54:33 +0100
Subject: [PATCH] feat(ci): specific build branch name under travis

Signed-off-by: Lorenzo Fontana <lo@linux.com>
---
 .travis.yml           |  1 -
 Makefile              |  3 ++-
 hack/release-image.sh | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44c89fbe..1f4343ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,4 @@ services:
 - docker
 script:
 - make _output/bin/kubectl-trace
-after_success:
 - ./hack/release-image.sh
diff --git a/Makefile b/Makefile
index 24280e36..b5e7defd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,10 @@ DOCKER ?= docker
 
 COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
 GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO})
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 
+
 IMAGE_BPFTRACE_BRANCH := quay.io/fntlnz/kubectl-trace-bpftrace:$(GIT_BRANCH_CLEAN)
 IMAGE_BPFTRACE_COMMIT := quay.io/fntlnz/kubectl-trace-bpftrace:$(GIT_COMMIT)
 IMAGE_BPFTRACE_LATEST := quay.io/fntlnz/kubectl-trace-bpftrace:latest
diff --git a/hack/release-image.sh b/hack/release-image.sh
index 19e21d36..42f9b9fb 100755
--- a/hack/release-image.sh
+++ b/hack/release-image.sh
@@ -7,14 +7,18 @@ set -xeo pipefail
 make=$(command -v make)
 docker=$(command -v docker)
 
-$make image/build
+makeopts=""
+if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
+  makeopts="-e GIT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH image/build"
+fi
+
+$make $makeopts image/build
 
 if [[ ! -z "$QUAY_TOKEN" ]]; then
   $docker login -u="fntlnz+travisci" -p="$QUAY_TOKEN" quay.io
-  $make image/push
-
-  if [[ "$TRAVIS_BRANCH" = "master" ]]; then
-    $make image/latest
-  fi
+  $make $makeopts image/push
 fi
 
+if [[ "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST_BRANCH" = "" ]]; then
+  $make $makeopts image/latest
+fi