kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4349 from oilbeater/update-go 

update go version and ldflags
This commit is contained in:
k8s-ci-robot 2018-02-01 13:33:07 -08:00 committed by GitHub
parent 9eb047a1c3 1dcc0e2627
commit 4ff964a390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -20,7 +20,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST=$(shell go env | grep GOPATH | cut -f 2 -d \") GOPATH_1ST=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.9.2 GOVERSION=1.9.3
BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build
LOCAL=$(BUILD)/local LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go federation/model/bindata.go BINDATA_TARGETS=upup/models/bindata.go federation/model/bindata.go
@ -90,7 +90,7 @@ ifdef STATIC_BUILD
CGO_ENABLED=0 CGO_ENABLED=0
export CGO_ENABLED export CGO_ENABLED
EXTRA_BUILDFLAGS=-installsuffix cgo EXTRA_BUILDFLAGS=-installsuffix cgo
EXTRA_LDFLAGS=-s EXTRA_LDFLAGS=-s -w
endif endif
SHASUMCMD := $(shell command -v sha1sum || command -v shasum; 2> /dev/null) SHASUMCMD := $(shell command -v sha1sum || command -v shasum; 2> /dev/null)