Skip to content

Commit 4929718

Browse files
tpoundsjirfag
authored andcommitted
Manage build tools via go.mod.
1 parent 9976bdc commit 4929718

File tree

1,437 files changed

+398584
-40
lines changed

Some content is hidden

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

1,437 files changed

+398584
-40
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ deploy:
3131
skip_cleanup: true
3232
script:
3333
- make test_race
34-
- curl -sL https://git.io/goreleaser | bash
34+
- make release
3535
on:
3636
tags: true
3737
# it's important to build on the newest version of go:

Makefile

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
.DEFAULT_GOAL = test
22
.PHONY: FORCE
33

4-
# Enable Go module support across all commands.
4+
# enable module support across all go commands.
55
export GO111MODULE = on
6+
# opt-in to vendor deps across all go commands.
7+
export GOFLAGS = -mod=vendor
68

79
# Build
810

@@ -59,51 +61,35 @@ fast_check_generated:
5961
.PHONY: fast_check_generated
6062

6163
release:
62-
rm -rf dist
63-
curl -sL https://git.io/goreleaser | bash
64+
go run ./vendor/github.com/goreleaser/goreleaser
6465
.PHONY: release
6566

6667
# Non-PHONY targets (real files)
6768

6869
golangci-lint: FORCE pkg/logutils/mock_logutils/mock_log.go
6970
go build -o $@ ./cmd/golangci-lint
7071

71-
tools/mockgen: go.mod go.sum
72-
GOBIN=$(CURDIR)/tools go install github.com/golang/mock/mockgen
73-
74-
tools/goimports: go.mod go.sum
75-
GOBIN=$(CURDIR)/tools go install golang.org/x/tools/cmd/goimports
76-
77-
tools/go.mod:
72+
tools:
7873
@mkdir -p tools
79-
@rm -f $@
80-
cd tools && go mod init local-tools
81-
82-
tools/godownloader: Makefile tools/go.mod
83-
# https://github.com/goreleaser/godownloader/issues/133
84-
cd tools && GOBIN=$(CURDIR)/tools go get -u github.com/goreleaser/godownloader
8574

86-
tools/svg-term:
87-
@mkdir -p tools
75+
tools/svg-term: tools
8876
cd tools && npm ci
8977
ln -sf node_modules/.bin/svg-term $@
9078

91-
tools/Dracula.itermcolors:
92-
@mkdir -p tools
79+
tools/Dracula.itermcolors: tools
9380
curl -fL -o $@ https://raw.githubusercontent.com/dracula/iterm/master/Dracula.itermcolors
9481

9582
docs/demo.svg: tools/svg-term tools/Dracula.itermcolors
96-
PATH=$(CURDIR)/tools:$${PATH} svg-term --cast=183662 --out docs/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2
83+
./tools/svg-term --cast=183662 --out docs/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2
9784

98-
install.sh: tools/godownloader .goreleaser.yml
99-
PATH=$(CURDIR)/tools:$${PATH} tools/godownloader .goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > $@
85+
install.sh: .goreleaser.yml
86+
go run ./vendor/github.com/goreleaser/godownloader .goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > $@
10087

10188
README.md: FORCE golangci-lint
10289
go run ./scripts/gen_readme/main.go
10390

104-
pkg/logutils/mock_logutils/mock_log.go: tools/mockgen tools/goimports pkg/logutils/log.go
105-
@rm -f $@
106-
PATH=$(CURDIR)/tools:$${PATH} go generate ./...
91+
pkg/logutils/mock_logutils/mock_log.go: pkg/logutils/log.go
92+
go generate ./...
10793

10894
go.mod: FORCE
10995
go mod tidy
@@ -112,5 +98,4 @@ go.sum: go.mod
11298

11399
.PHONY: vendor
114100
vendor: go.mod go.sum
115-
rm -rf vendor
116101
go mod vendor

go.mod

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ require (
2222
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21
2323
github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0
2424
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4
25+
github.com/goreleaser/godownloader v0.0.0-20190907185828-93b2b793cd90
26+
github.com/goreleaser/goreleaser v0.118.0
2527
github.com/matoous/godox v0.0.0-20190910121045-032ad8106c86
2628
github.com/mattn/go-colorable v0.1.2
2729
github.com/mitchellh/go-homedir v1.1.0
@@ -47,7 +49,16 @@ require (
4749
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f
4850
)
4951

50-
// https://github.com/golang/tools/pull/162
51-
// https://github.com/golang/tools/pull/160
52-
// https://github.com/golang/tools/pull/156
53-
replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
52+
replace (
53+
// Fix godownloader/goreleaser deps (ambiguous imports/invalid pseudo-version)
54+
// https://github.com/goreleaser/godownloader/issues/133
55+
// https://github.com/goreleaser/goreleaser/issues/1145
56+
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.1+incompatible
57+
github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1
58+
github.com/go-macaron/cors => github.com/go-macaron/cors v0.0.0-20190418220122-6fd6a9bfe14e
59+
60+
// https://github.com/golang/tools/pull/156
61+
// https://github.com/golang/tools/pull/160
62+
// https://github.com/golang/tools/pull/162
63+
golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
64+
)

go.sum

Lines changed: 823 additions & 2 deletions
Large diffs are not rendered by default.

pkg/logutils/log.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package logutils
22

3-
//go:generate mockgen -source log.go -destination mock_logutils/mock_log.go
4-
//go:generate goimports -w mock_logutils/mock_log.go
3+
//go:generate go run ../../vendor/github.com/golang/mock/mockgen -source log.go -destination mock_logutils/mock_log.go
4+
//go:generate go run ../../vendor/golang.org/x/tools/cmd/goimports -w mock_logutils/mock_log.go
55

66
type Log interface {
77
Fatalf(format string, args ...interface{})

tools.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// +build tools
2+
3+
package tools
4+
5+
// Manage tool dependencies via go.mod.
6+
//
7+
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
8+
// https://github.com/golang/go/issues/25922
9+
//
10+
// nolint
11+
import (
12+
_ "github.com/golang/mock/mockgen"
13+
_ "github.com/goreleaser/godownloader"
14+
_ "github.com/goreleaser/goreleaser"
15+
_ "golang.org/x/tools/cmd/goimports"
16+
)

vendor/cloud.google.com/go/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)