Skip to content

Commit 7ef6fbf

Browse files
author
Gal Topper
authored
Merge pull request #71 from v3io/development
Revert "Avoid go get before build. (#67)" (#70)
2 parents 617036a + 9c36f28 commit 7ef6fbf

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: .travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go:
44
- "1.10.x"
55

66
script:
7-
- make get
87
- make test
98
- make lint
109

Diff for: Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ get:
1818
go get -v -t -tags "unit integration" $(TOPLEVEL_DIRS)
1919

2020
.PHONY: test
21-
test:
21+
test: get
2222
go test -race -tags unit -count 1 $(TOPLEVEL_DIRS)
2323

2424
.PHONY: integration
25-
integration:
25+
integration: get
2626
go test -race -tags integration -p 1 -count 1 $(TOPLEVEL_DIRS) # p=1 to force Go to run pkg tests serially.
2727

2828
.PHONY: build
29-
build:
29+
build: get
3030
go build -v -o "$(GOPATH)/bin/$(TSDBCTL_BIN_NAME)" ./cmd/tsdbctl
3131

3232
.PHONY: lint

0 commit comments

Comments
 (0)