Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d365846

Browse files
fsouzarheinwein
authored andcommittedMay 2, 2016
all: stop vendoring external dependencies
It's not good practice for a library, but we vendored our dependencies in the past because go get github.com/fsouza/go-dockerclient was too slow, but now vendoring is well advised in Go 1.5 and standard in Go 1.6. I'm also dropping Go 1.4 as some standard tools developed by the Go core team already did that. This will make tests on Travis run even faster, but I can hope that golang/go#13078 will eventually get fixed.
1 parent eaf741d commit d365846

File tree

184 files changed

+37
-23570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+37
-23570
lines changed
 

‎.travis.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
language: go
22
sudo: required
33
go:
4-
- 1.4.2
54
- 1.5.4
65
- 1.6.1
76
- tip
87
os:
98
- linux
109
- osx
1110
env:
12-
- GOARCH=amd64 DOCKER_VERSION=1.9.1
13-
- GOARCH=386 DOCKER_VERSION=1.9.1
14-
- GOARCH=amd64 DOCKER_VERSION=1.10.3
15-
- GOARCH=386 DOCKER_VERSION=1.10.3
16-
- GOARCH=amd64 DOCKER_VERSION=1.11.0
17-
- GOARCH=386 DOCKER_VERSION=1.11.0
11+
matrix:
12+
- GOARCH=amd64 DOCKER_VERSION=1.9.1
13+
- GOARCH=386 DOCKER_VERSION=1.9.1
14+
- GOARCH=amd64 DOCKER_VERSION=1.10.3
15+
- GOARCH=386 DOCKER_VERSION=1.10.3
16+
- GOARCH=amd64 DOCKER_VERSION=1.11.1
17+
- GOARCH=386 DOCKER_VERSION=1.11.1
18+
global:
19+
- GO_TEST_FLAGS=-race
20+
- DOCKER_HOST=tcp://127.0.0.1:2375
1821
install:
19-
- travis_retry travis-scripts/install.bash
22+
- make testdeps
23+
- travis_retry travis-scripts/install-docker.bash
2024
script:
2125
- travis-scripts/run-tests.bash
2226
services:

‎Makefile

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.PHONY: \
22
all \
3-
vendor \
43
lint \
54
vet \
65
fmt \
@@ -11,37 +10,33 @@
1110
cov \
1211
clean
1312

14-
PKGS = . ./testing
15-
1613
all: test
1714

18-
vendor:
19-
@ go get -v github.com/mjibson/party
20-
party -d external -c -u
21-
2215
lint:
2316
@ go get -v github.com/golang/lint/golint
24-
@for file in $$(git ls-files '*.go' | grep -v 'external/'); do \
17+
@for file in $$(git ls-files '*.go'); do \
2518
export output="$$(golint $${file} | grep -v 'type name will be used as docker.DockerInfo')"; \
2619
[ -n "$${output}" ] && echo "$${output}" && export status=1; \
2720
done; \
2821
exit $${status:-0}
2922

3023
vet:
31-
$(foreach pkg,$(PKGS),go vet $(pkg);)
24+
go vet ./...
3225

3326
fmt:
34-
gofmt -s -w $(PKGS)
27+
gofmt -s -w .
3528

3629
fmtcheck:
37-
@ export output=$$(gofmt -s -d $(PKGS)); \
30+
@ export output=$$(gofmt -s -d .); \
3831
[ -n "$${output}" ] && echo "$${output}" && export status=1; \
3932
exit $${status:-0}
33+
testdeps:
34+
go get -d -t ./...
4035

41-
pretest: lint vet fmtcheck
36+
pretest: testdeps lint vet fmtcheck
4237

4338
gotest:
44-
$(foreach pkg,$(PKGS),go test $(pkg) || exit;)
39+
go test $(GO_TEST_FLAGS) ./...
4540

4641
test: pretest gotest
4742

0 commit comments

Comments
 (0)
Please sign in to comment.