Bump Go version from 1.4.2 to 1.5.1.

Sync Makefile.COMMON with other projects.
Fix associated lint warning.
This commit is contained in:
Michal Mazurek 2015-10-27 19:45:10 +01:00
parent 0b50067f55
commit 4c374fcb45
2 changed files with 9 additions and 13 deletions

View File

@ -21,12 +21,12 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null || echo 'unk
HOSTNAME := $(shell hostname -f)
BUILD_DATE := $(shell date +%Y%m%d-%H:%M:%S)
GOFLAGS := -ldflags \
"-X=main.buildVersion $(VERSION)\
-X=main.buildRevision $(REV)\
-X=main.buildBranch $(BRANCH)\
-X=main.buildUser $(USER)@$(HOSTNAME)\
-X=main.buildDate $(BUILD_DATE)\
-X=main.goVersion $(GO_VERSION)"
"-X main.buildVersion=$(VERSION)\
-X main.buildRevision=$(REV)\
-X main.buildBranch=$(BRANCH)\
-X main.buildUser=$(USER)@$(HOSTNAME)\
-X main.buildDate=$(BUILD_DATE)\
-X main.goVersion=$(GO_VERSION)"
web: web/blob/files.go

View File

@ -44,13 +44,9 @@ SRC ?= $(shell find . -type f -name "*.go" ! -path "./.build/*")
GOOS ?= $(shell uname | tr A-Z a-z)
GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
ifeq ($(GOOS),darwin)
RELEASE_SUFFIX ?= -osx$(shell sw_vers -productVersion)
endif
GO_VERSION ?= 1.4.2
GO_VERSION ?= 1.5.1
GOURL ?= https://golang.org/dl
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH)$(RELEASE_SUFFIX).tar.gz
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz
GOPATH := $(CURDIR)/.build/gopath
# Check for the correct version of go in the path. If we find it, use it.
@ -101,7 +97,7 @@ $(BINARY): $(GOCC) $(SRC) dependencies-stamp Makefile Makefile.COMMON
archive: $(ARCHIVE)
$(ARCHIVE): $(BINARY)
tar -czf $@ $<
tar --owner=root --group=root -czf $@ $<
.PHONY: tag
tag: