Merge pull request #910 from RichardScothern/go-1.5

Use go 1.5 on the build machine
This commit is contained in:
Richard Scothern 2015-11-11 16:31:28 -08:00
commit 9577d3053a
2 changed files with 14 additions and 42 deletions

View file

@ -11,7 +11,7 @@ ifeq (${DISABLE_OPTIMIZATION},true)
VERSION:="$(VERSION)-noopt" VERSION:="$(VERSION)-noopt"
endif endif
GO_LDFLAGS=-ldflags "-X `go list ./version`.Version $(VERSION)" GO_LDFLAGS=-ldflags "-X `go list ./version`.Version=$(VERSION)"
.PHONY: clean all fmt vet lint build test binaries .PHONY: clean all fmt vet lint build test binaries
.DEFAULT: default .DEFAULT: default

View file

@ -8,19 +8,15 @@ machine:
- ceph osd pool create docker-distribution 1 - ceph osd pool create docker-distribution 1
post: post:
# Install many go versions # go
# - gvm install go1.3.3 -B --name=old - gvm install go1.5 --prefer-binary --name=stable
- gvm install go1.4.2 -B --name=stable
# - gvm install tip --name=bleed
environment: environment:
# Convenient shortcuts to "common" locations # Convenient shortcuts to "common" locations
CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME
BASE_DIR: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME BASE_DIR: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
# Trick circle brainflat "no absolute path" behavior # Trick circle brainflat "no absolute path" behavior
BASE_OLD: ../../../$HOME/.gvm/pkgsets/old/global/$BASE_DIR
BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR
# BASE_BLEED: ../../../$HOME/.gvm/pkgsets/bleed/global/$BASE_DIR
DOCKER_BUILDTAGS: "include_rados include_oss include_gcs" DOCKER_BUILDTAGS: "include_rados include_oss include_gcs"
# Workaround Circle parsing dumb bugs and/or YAML wonkyness # Workaround Circle parsing dumb bugs and/or YAML wonkyness
CIRCLE_PAIN: "mode: set" CIRCLE_PAIN: "mode: set"
@ -34,37 +30,22 @@ machine:
dependencies: dependencies:
pre: pre:
# Copy the code to the gopath of all go versions # Copy the code to the gopath of all go versions
# - >
# gvm use old &&
# mkdir -p "$(dirname $BASE_OLD)" &&
# cp -R "$CHECKOUT" "$BASE_OLD"
- > - >
gvm use stable && gvm use stable &&
mkdir -p "$(dirname $BASE_STABLE)" && mkdir -p "$(dirname $BASE_STABLE)" &&
cp -R "$CHECKOUT" "$BASE_STABLE" cp -R "$CHECKOUT" "$BASE_STABLE"
# - >
# gvm use bleed &&
# mkdir -p "$(dirname $BASE_BLEED)" &&
# cp -R "$CHECKOUT" "$BASE_BLEED"
override: override:
# Install dependencies for every copied clone/go version # Install dependencies for every copied clone/go version
# - gvm use old && go get github.com/tools/godep:
# pwd: $BASE_OLD
- gvm use stable && go get github.com/tools/godep: - gvm use stable && go get github.com/tools/godep:
pwd: $BASE_STABLE pwd: $BASE_STABLE
# - gvm use bleed && go get github.com/tools/godep:
# pwd: $BASE_BLEED
post: post:
# For the stable go version, additionally install linting tools # For the stable go version, additionally install linting tools
- > - >
gvm use stable && gvm use stable &&
go get github.com/axw/gocov/gocov github.com/golang/lint/golint go get github.com/axw/gocov/gocov github.com/golang/lint/golint
# Disabling goveralls for now # Disabling goveralls for now
# go get github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/golang/lint/golint # go get github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/golang/lint/golint
@ -73,7 +54,6 @@ test:
# Output the go versions we are going to test # Output the go versions we are going to test
# - gvm use old && go version # - gvm use old && go version
- gvm use stable && go version - gvm use stable && go version
# - gvm use bleed && go version
# First thing: build everything. This will catch compile errors, and it's # First thing: build everything. This will catch compile errors, and it's
# also necessary for go vet to work properly (see #807). # also necessary for go vet to work properly (see #807).
@ -84,7 +64,7 @@ test:
- gvm use stable && test -z "$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)": - gvm use stable && test -z "$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)":
pwd: $BASE_STABLE pwd: $BASE_STABLE
# VET # VET
- gvm use stable && go vet ./...: - gvm use stable && go vet ./...:
pwd: $BASE_STABLE pwd: $BASE_STABLE
@ -93,30 +73,22 @@ test:
pwd: $BASE_STABLE pwd: $BASE_STABLE
override: override:
# Test every version we have (but stable)
# - gvm use old; godep go test -test.v -test.short ./...:
# timeout: 600
# pwd: $BASE_OLD
# - gvm use bleed; go test -test.v -test.short ./...:
# timeout: 600
# pwd: $BASE_BLEED
# Test stable, and report # Test stable, and report
# Preset the goverall report file # Preset the goverall report file
- echo "$CIRCLE_PAIN" > ~/goverage.report # - echo "$CIRCLE_PAIN" > ~/goverage.report
- gvm use stable; go list ./... | xargs -L 1 -I{} rm -f $GOPATH/src/{}/coverage.out:
pwd: $BASE_STABLE - gvm use stable; go list ./... | xargs -L 1 -I{} rm -f $GOPATH/src/{}/coverage.out:
- gvm use stable; go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}: pwd: $BASE_STABLE
timeout: 600
pwd: $BASE_STABLE - gvm use stable; go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} godep go test -tags "$DOCKER_BUILDTAGS" -test.short -coverprofile=$GOPATH/src/{}/coverage.out {}:
timeout: 600
pwd: $BASE_STABLE
post: post:
# Aggregate and report to coveralls # Aggregate and report to coveralls
- gvm use stable; go list ./... | xargs -L 1 -I{} cat "$GOPATH/src/{}/coverage.out" | grep -v "$CIRCLE_PAIN" >> ~/goverage.report: - gvm use stable; go list -tags "$DOCKER_BUILDTAGS" ./... | xargs -L 1 -I{} cat "$GOPATH/src/{}/coverage.out" | grep -v "$CIRCLE_PAIN" >> ~/goverage.report:
pwd: $BASE_STABLE pwd: $BASE_STABLE
# - gvm use stable; goveralls -service circleci -coverprofile=/home/ubuntu/goverage.report -repotoken $COVERALLS_TOKEN:
# pwd: $BASE_STABLE
## Notes ## Notes
# Disabled coveralls reporting: build breaking sending coverage data to coveralls # Disabled coveralls reporting: build breaking sending coverage data to coveralls