From 56249320e31346f1e743b065f04a94c427bac535 Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Wed, 12 Jun 2013 18:45:39 +0200 Subject: [PATCH] Remove gvm on travis. --- .travis.yml | 5 +++-- Makefile | 2 +- Makefile.INCLUDE | 1 + build/.gitignore | 1 + build/Makefile | 7 ++++--- tests-for-die-in-a-fire-travis.sh | 2 -- tests-for-die-in-a-fire-travis.shlib | 23 ----------------------- tools/dumper/.gitignore | 1 + web/blob/Makefile | 4 +++- 9 files changed, 14 insertions(+), 32 deletions(-) create mode 100644 build/.gitignore delete mode 100644 tests-for-die-in-a-fire-travis.shlib create mode 100644 tools/dumper/.gitignore diff --git a/.travis.yml b/.travis.yml index 487339e2898..c6b34dbe002 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Makefile b/Makefile index 4afde89af76..0927ecb0ac7 100644 --- a/Makefile +++ b/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) diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE index 65a2fe3e796..e6318d793f8 100644 --- a/Makefile.INCLUDE +++ b/Makefile.INCLUDE @@ -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 diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 00000000000..cfbfa1fdd95 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1 @@ +root/ diff --git a/build/Makefile b/build/Makefile index b2db1f482ce..62167e4ccc8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -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 diff --git a/tests-for-die-in-a-fire-travis.sh b/tests-for-die-in-a-fire-travis.sh index a111001fdf6..033a90ff2df 100755 --- a/tests-for-die-in-a-fire-travis.sh +++ b/tests-for-die-in-a-fire-travis.sh @@ -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 diff --git a/tests-for-die-in-a-fire-travis.shlib b/tests-for-die-in-a-fire-travis.shlib deleted file mode 100644 index bdad5449002..00000000000 --- a/tests-for-die-in-a-fire-travis.shlib +++ /dev/null @@ -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 diff --git a/tools/dumper/.gitignore b/tools/dumper/.gitignore new file mode 100644 index 00000000000..cd066db0e10 --- /dev/null +++ b/tools/dumper/.gitignore @@ -0,0 +1 @@ +dumper diff --git a/web/blob/Makefile b/web/blob/Makefile index 5c64fa19256..a041c34151a 100644 --- a/web/blob/Makefile +++ b/web/blob/Makefile @@ -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