From 4bc2284b57812eb3eb46096e785547135fed81fb Mon Sep 17 00:00:00 2001
From: Murat Kabilov <murat@kabilov.com>
Date: Wed, 11 Oct 2017 12:01:35 +0200
Subject: [PATCH] bump go version to 1.9

---
 .travis.yml   | 2 +-
 Makefile      | 3 ---
 delivery.yaml | 9 ++++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26bdc4d78..45afe7b21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: go
 
 go:
-  - 1.8
+  - 1.9
 
 before_install:
   - go get github.com/Masterminds/glide
diff --git a/Makefile b/Makefile
index c813a9032..a03d3c2eb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,6 @@
 
 BINARY ?= postgres-operator
 BUILD_FLAGS ?= -v
-ifeq ("$(shell uname)", "Darwin")
-BUILD_FLAGS += -i
-endif
 CGO_ENABLED ?= 0
 ifeq ($(RACE),1)
 	BUILD_FLAGS += -race -a
diff --git a/delivery.yaml b/delivery.yaml
index 4b597c482..9878a2ad5 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -4,9 +4,12 @@ build_steps:
         apt-get install -y make git apt-transport-https ca-certificates curl
     - desc: 'Install go'
       cmd: |
-        add-apt-repository ppa:longsleep/golang-backports
-        apt-get update
-        apt-get install -y golang-go
+        cd /tmp
+        wget -q https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz -O go.tar.gz
+        tar -xf go.tar.gz
+        mv go /usr/local
+        ln -s /usr/local/go/bin/go /usr/bin/go
+        go version
     - desc: 'Install Docker'
       cmd: |
         curl -sSL https://get.docker.com/ | sh