mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #424 from tsenart/go1.4

Browse source 
Upgrade to Go 1.4
This commit is contained in:
Björn Rabenstein 2014-12-15 14:30:12 +01:00
parent f2052c9c0d 09c58ce481
commit e2fddd62e9
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -27,6 +27,7 @@ core
*-stamp *-stamp
prometheus prometheus
benchmark.txt
.#* .#*
command-line-arguments.test command-line-arguments.test

4
Makefile
View file

@ -49,8 +49,8 @@ tag:
$(BUILD_PATH)/cache/$(GOPKG): $(BUILD_PATH)/cache/$(GOPKG):
$(CURL) -o $@ -L $(GOURL)/$(GOPKG) $(CURL) -o $@ -L $(GOURL)/$(GOPKG)
benchmark: test benchmark: config dependencies tools
$(GO) test $(GO_TEST_FLAGS) -test.bench='Benchmark' ./... $(GO) test $(GO_TEST_FLAGS) -test.run='NONE' -test.bench='.*' -test.benchmem ./... | tee benchmark.txt
clean: clean:
$(MAKE) -C $(BUILD_PATH) clean $(MAKE) -C $(BUILD_PATH) clean

2
Makefile.INCLUDE
View file

@ -26,7 +26,7 @@ MAC_OS_X_VERSION ?= 10.8
BUILD_PATH = $(PWD)/.build BUILD_PATH = $(PWD)/.build
GO_VERSION := 1.3.3 GO_VERSION := 1.4
GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(OS))) GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(OS)))
ifeq ($(GOOS),darwin) ifeq ($(GOOS),darwin)