Skip to content

Commit 494d65d

Browse files
alexshtinalexshtin
authored
Clean up Makefile and update dependencies (#76)
1 parent ea11a06 commit 494d65d

File tree

3 files changed

+27
-30
lines changed

3 files changed

+27
-30
lines changed

‎Makefile

+9-10
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ INTEG_TEST_DIRS := $(sort $(dir $(shell find $(INTEG_TEST_ROOT) -name *_test.go)
2323
# Files that needs to run lint. Excludes testify mocks.
2424
LINT_SRC := $(filter-out ./mocks/%,$(ALL_SRC))
2525

26-
gobin:
27-
GO111MODULE=off go get -u github.com/myitcv/gobin
28-
2926
# `make copyright` or depend on "copyright" to force-run licensegen,
3027
# or depend on $(BUILD)/copyright to let it run as needed.
3128
copyright $(BUILD)/copyright: $(ALL_SRC)
@@ -87,8 +84,8 @@ define lint_if_present
8784
test -n "$1" && golint -set_exit_status $1
8885
endef
8986

90-
lint: gobin $(ALL_SRC)
91-
gobin -mod=readonly golang.org/x/lint/golint
87+
lint: $(ALL_SRC)
88+
GO111MODULE=off go get -u golang.org/x/lint/golint
9289
@$(foreach pkg,\
9390
$(sort $(dir $(LINT_SRC))), \
9491
$(call lint_if_present,$(filter $(wildcard $(pkg)*.go),$(LINT_SRC))) || ERR=1; \
@@ -100,16 +97,18 @@ lint: gobin $(ALL_SRC)
10097
exit 1; \
10198
fi
10299

103-
staticcheck: gobin $(ALL_SRC)
104-
gobin -mod=readonly -run honnef.co/go/tools/cmd/staticcheck ./...
100+
staticcheck: $(ALL_SRC)
101+
GO111MODULE=off go get -u honnef.co/go/tools/cmd/staticcheck
102+
staticcheck ./...
105103

106-
errcheck: gobin $(ALL_SRC)
107-
gobin -mod=readonly -run github.com/kisielk/errcheck ./...
104+
errcheck: $(ALL_SRC)
105+
GO111MODULE=off go get -u github.com/kisielk/errcheck
106+
errcheck ./...
108107

109108
fmt:
110109
@gofmt -w $(ALL_SRC)
111110

112111
clean:
113112
rm -rf $(BUILD)
114113

115-
check: fmt lint errcheck staticcheck test
114+
check: fmt lint errcheck staticcheck copyright test

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ require (
1919
github.com/pborman/uuid v1.2.0
2020
github.com/pkg/errors v0.9.1 // indirect
2121
github.com/robfig/cron v1.2.0
22-
github.com/sirupsen/logrus v1.4.2
22+
github.com/sirupsen/logrus v1.5.0
2323
github.com/stretchr/objx v0.2.0 // indirect
2424
github.com/stretchr/testify v1.5.1
2525
github.com/uber-go/tally v3.3.15+incompatible
2626
github.com/uber/jaeger-client-go v2.22.1+incompatible
2727
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
28-
go.temporal.io/temporal-proto v0.0.0-20200316214407-583dbd3e3b32
28+
go.temporal.io/temporal-proto v0.20.0-alpha
2929
go.uber.org/atomic v1.6.0
3030
go.uber.org/goleak v1.0.0
3131
go.uber.org/zap v1.14.1
3232
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
33-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
34-
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 // indirect
33+
golang.org/x/net v0.0.0-20200320220750-118fecf932d8
34+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
3535
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
36-
golang.org/x/tools v0.0.0-20200317043434-63da46f3035e // indirect
37-
google.golang.org/genproto v0.0.0-20200316142031-303a05041dad // indirect
36+
golang.org/x/tools v0.0.0-20200323210725-ef1313dc6d0a // indirect
37+
google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472 // indirect
3838
google.golang.org/grpc v1.28.0
3939
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
4040
gopkg.in/yaml.v2 v2.2.8 // indirect

‎go.sum

+12-14
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
7878
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
7979
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
8080
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
81-
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
82-
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
81+
github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
82+
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
8383
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
84-
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
85-
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
8684
github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
8785
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
8886
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -98,8 +96,8 @@ github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMW
9896
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
9997
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
10098
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
101-
go.temporal.io/temporal-proto v0.0.0-20200316214407-583dbd3e3b32 h1:4otOD3el3H50v1/WEDnKZMsYSOcRvxDWDvmFIPGT13Q=
102-
go.temporal.io/temporal-proto v0.0.0-20200316214407-583dbd3e3b32/go.mod h1:SszgPhzKZvtDenZxaN68OKKj1RD1uVmDOHUn1RnTctk=
99+
go.temporal.io/temporal-proto v0.20.0-alpha h1:p/PBkudRd2w4f2Gu1oSAwLDRazTsX7i895gG3Q80SsY=
100+
go.temporal.io/temporal-proto v0.20.0-alpha/go.mod h1:SszgPhzKZvtDenZxaN68OKKj1RD1uVmDOHUn1RnTctk=
103101
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
104102
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
105103
go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
@@ -135,8 +133,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
135133
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
136134
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
137135
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
138-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
139-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
136+
golang.org/x/net v0.0.0-20200320220750-118fecf932d8 h1:1+zQlQqEEhUeStBTi653GZAnAuivZq/2hz+Iz+OP7rg=
137+
golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
140138
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
141139
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
142140
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -149,8 +147,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
149147
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
150148
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
151149
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
152-
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 h1:4Khi5GeNOkZS5DqSBRn4Sy7BE6GuxwOqARPqfurkdNk=
153-
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
150+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
151+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
154152
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
155153
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
156154
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -171,8 +169,8 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtn
171169
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
172170
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
173171
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
174-
golang.org/x/tools v0.0.0-20200317043434-63da46f3035e h1:8ogAbHWoJTPepnVbNRqXLOpzMkl0rtRsM7crbflc4XM=
175-
golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
172+
golang.org/x/tools v0.0.0-20200323210725-ef1313dc6d0a h1:QpsrlnR31DN2tCItRzamUXN4oAe3U00ru8f0ik9HSYI=
173+
golang.org/x/tools v0.0.0-20200323210725-ef1313dc6d0a/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
176174
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
177175
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
178176
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
@@ -185,8 +183,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2El
185183
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
186184
google.golang.org/genproto v0.0.0-20200207204624-4f3edf09f4f6 h1:tirixpud1WdjE3/NrL9ar4ot0ADfwls8sOcIf1ivRDw=
187185
google.golang.org/genproto v0.0.0-20200207204624-4f3edf09f4f6/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
188-
google.golang.org/genproto v0.0.0-20200316142031-303a05041dad h1:X7UJIdVkigJ9Se+KCiK9ERNUhYAmzSqPe/jIZPoODjw=
189-
google.golang.org/genproto v0.0.0-20200316142031-303a05041dad/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
186+
google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472 h1:XRuIAeTRoXziYGYTVer+YGxVXQBiOhZ8+SpNELP73oQ=
187+
google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
190188
google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
191189
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
192190
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=

0 commit comments

Comments
 (0)