use Go 1.5

mackerelio · Nov 23, 2015 · 28b4994 · 28b4994
1 parent 2a7d29f
commit 28b4994
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,13 @@
 language: go
 go:
-- 1.3
+- 1.5
 env: PATH=/home/travis/gopath/bin:$PATH
 install:
 - go get github.com/laher/goxc
 - sudo apt-get update
 - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y rpm devscripts debhelper
 - mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 script:
-- goxc -t
 - make all
 after_script:
 - make cover

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ BIN = mkr
 VERSION = $$(git describe --tags --always --dirty)
 
 BUILD_FLAGS = -ldflags "\
-	      -X main.Version \"$(VERSION)\" \
+	      -X main.Version=$(VERSION) \
 	      "
 
 all: clean cross lint test
@@ -22,7 +22,7 @@ lint: testdeps
 	test ! -s $(LINT_RET)
 
 cross: deps
-	goxc -tasks='xc archive' -bc 'linux,!arm darwin' -d . -build-ldflags "-X main.Version \"$(VERSION)\"" -resources-include='README*'
+	goxc -tasks='xc archive' -bc 'linux,!arm darwin' -d . -build-ldflags "-X main.Version=$(VERSION)" -resources-include='README*'
 	cp -p $(PWD)/snapshot/linux_amd64/mkr $(PWD)/snapshot/mkr_linux_amd64
 	cp -p $(PWD)/snapshot/linux_386/mkr $(PWD)/snapshot/mkr_linux_386
 	cp -p $(PWD)/snapshot/darwin_amd64/mkr $(PWD)/snapshot/mkr_darwin_amd64