mirror of
https://github.com/prometheus/prometheus
synced 2024-12-24 23:42:32 +00:00
Remove gvm on travis.
This commit is contained in:
parent
4524a5fe37
commit
56249320e3
@ -2,6 +2,9 @@
|
||||
|
||||
language: go
|
||||
|
||||
go:
|
||||
- 1.1
|
||||
|
||||
# Explicitly stop before_script from doing anything by giving 'em nil work.
|
||||
before_script:
|
||||
- echo "Before Script"
|
||||
@ -13,6 +16,4 @@ install:
|
||||
script:
|
||||
- echo "Script"
|
||||
- cd ${TRAVIS_BUILD_DIR}
|
||||
- gvm install go1.1 || true
|
||||
- gvm use go1.1 || true
|
||||
- bash -l ./tests-for-die-in-a-fire-travis.sh
|
||||
|
2
Makefile
2
Makefile
@ -41,7 +41,7 @@ documentation: search_index
|
||||
godoc -http=:6060 -index -index_files='search_index'
|
||||
|
||||
format:
|
||||
find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOROOT)/bin/gofmt -w -s=true
|
||||
find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
|
||||
|
||||
build/cache/$(GOPKG):
|
||||
curl -o $@ http://go.googlecode.com/files/$(GOPKG)
|
||||
|
@ -38,6 +38,7 @@ GOCC = $(GOROOT)/bin/go
|
||||
TMPDIR = /tmp
|
||||
GOENV = TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH)
|
||||
GO = $(GOENV) $(GOCC)
|
||||
GOFMT = $(GOENV) $(GOROOT)/bin/gofmt
|
||||
|
||||
LEVELDB_VERSION := 1.9.0
|
||||
PROTOCOL_BUFFERS_VERSION := 2.5.0
|
||||
|
1
build/.gitignore
vendored
Normal file
1
build/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
root/
|
@ -45,18 +45,18 @@ cc-implementation-Linux-stamp:
|
||||
[ -x "$$(which cc)" ] || $(APT_GET_INSTALL) build-essential
|
||||
touch $@
|
||||
|
||||
dependencies-stamp: cache-stamp go-stamp goprotobuf-stamp gorest-stamp goskiplist-stamp instrumentation-stamp levigo-stamp
|
||||
dependencies-stamp: cache-stamp go-stamp goprotobuf-protoc-gen-go-stamp gorest-stamp goskiplist-stamp instrumentation-stamp levigo-stamp
|
||||
touch $@
|
||||
|
||||
go-stamp:
|
||||
[ -x "$$(which go)" ] || { echo "go not found." ; false ; }
|
||||
touch $@
|
||||
|
||||
goprotobuf-protoc-gen-go-stamp: protoc-stamp
|
||||
goprotobuf-protoc-gen-go-stamp: protoc-stamp goprotobuf-stamp
|
||||
$(GO_GET) code.google.com/p/goprotobuf/protoc-gen-go $(THIRD_PARTY_BUILD_OUTPUT)
|
||||
touch $@
|
||||
|
||||
goprotobuf-stamp: go-stamp mercurial-stamp
|
||||
goprotobuf-stamp: go-stamp protoc-stamp mercurial-stamp
|
||||
$(GO_GET) code.google.com/p/goprotobuf/proto $(THIRD_PARTY_BUILD_OUTPUT)
|
||||
touch $@
|
||||
|
||||
@ -159,6 +159,7 @@ clean:
|
||||
$(MAKE) -C cache clean
|
||||
$(MAKE) -C dirty clean
|
||||
$(MAKE) -C root clean
|
||||
$(MAKE) -C package clean
|
||||
rm -rf *-stamp
|
||||
|
||||
|
||||
|
@ -16,6 +16,4 @@
|
||||
# A helper until https://github.com/travis-ci/travis-cookbooks/issues/184 is
|
||||
# remedied.
|
||||
|
||||
. ./tests-for-die-in-a-fire-travis.shlib
|
||||
|
||||
make -f Makefile || exit 1
|
||||
|
@ -1,23 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2013 Prometheus Team
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# A helper until https://github.com/travis-ci/travis-cookbooks/issues/184 is
|
||||
# remedied.
|
||||
|
||||
gvm install go1.1
|
||||
gvm use go1.1
|
||||
|
||||
go version
|
||||
go env
|
1
tools/dumper/.gitignore
vendored
Normal file
1
tools/dumper/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
dumper
|
@ -11,12 +11,14 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include ../../Makefile.INCLUDE
|
||||
|
||||
all: files.go
|
||||
|
||||
SUFFIXES:
|
||||
|
||||
files.go: $(shell find ../templates/ ../static/ -type f)
|
||||
../../utility/embed-static.sh ../static ../templates | gofmt > $@
|
||||
../../utility/embed-static.sh ../static ../templates | $(GOFMT) > $@
|
||||
|
||||
clean:
|
||||
-rm files.go
|
||||
|
Loading…
Reference in New Issue
Block a user