Skip to content

Commit 9a435ce

Browse files
authored
Merge pull request #2784 from mjlshen/apidiff
🌱 remove tools package in favor of go install
2 parents dda4b5f + c94f63e commit 9a435ce

File tree

4 files changed

+4
-98
lines changed

4 files changed

+4
-98
lines changed

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,11 @@ golangci-lint:
8888

8989
.PHONY: apidiff
9090
apidiff: go-apidiff ## Run the go-apidiff to verify any API differences compared with origin/master
91-
$(GO_APIDIFF) master --compare-imports --print-compatible --repo-path=.
91+
$(GOBIN)/go-apidiff master --compare-imports --print-compatible --repo-path=.
9292

93-
GO_APIDIFF = $(shell pwd)/bin/go-apidiff
93+
.PHONY: go-apidiff
9494
go-apidiff:
95-
@[ -f $(GO_APIDIFF) ] || { \
96-
cd tools && go build -tags=tools -o $(GO_APIDIFF) github.com/joelanford/go-apidiff ;\
97-
}
95+
go install github.com/joelanford/[email protected]
9896

9997
##@ Tests
10098

go.mod

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ go 1.17
55
require (
66
github.com/cloudflare/cfssl v1.5.0 // for `kubebuilder alpha config-gen`
77
github.com/gobuffalo/flect v0.2.5
8-
github.com/joelanford/go-apidiff v0.1.0
98
github.com/onsi/ginkgo v1.16.5
109
github.com/onsi/gomega v1.18.1
1110
github.com/sirupsen/logrus v1.8.1
1211
github.com/spf13/afero v1.6.0
1312
github.com/spf13/cobra v1.4.0
1413
github.com/spf13/pflag v1.0.5
14+
golang.org/x/text v0.3.7
1515
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717
1616
k8s.io/apimachinery v0.24.0 // for `kubebuilder alpha config-gen`
1717
sigs.k8s.io/controller-runtime v0.12.1
@@ -20,14 +20,11 @@ require (
2020
sigs.k8s.io/yaml v1.3.0
2121
)
2222

23-
require golang.org/x/text v0.3.7
24-
2523
require (
2624
github.com/PuerkitoBio/purell v1.1.1 // indirect
2725
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2826
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2927
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/emirpasic/gods v1.12.0 // indirect
3128
github.com/fsnotify/fsnotify v1.5.1 // indirect
3229
github.com/go-errors/errors v1.0.1 // indirect
3330
github.com/go-logr/logr v1.2.0 // indirect
@@ -39,40 +36,30 @@ require (
3936
github.com/google/certificate-transparency-go v1.0.21 // indirect
4037
github.com/google/gofuzz v1.1.0 // indirect
4138
github.com/inconshreveable/mousetrap v1.0.0 // indirect
42-
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
4339
github.com/jmoiron/sqlx v1.2.0 // indirect
4440
github.com/josharian/intern v1.0.0 // indirect
4541
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
4742
github.com/mailru/easyjson v0.7.6 // indirect
48-
github.com/mitchellh/go-homedir v1.1.0 // indirect
4943
github.com/mitchellh/mapstructure v1.4.1 // indirect
5044
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5145
github.com/modern-go/reflect2 v1.0.2 // indirect
5246
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5347
github.com/nxadm/tail v1.4.8 // indirect
5448
github.com/pkg/errors v0.9.1 // indirect
5549
github.com/pmezard/go-difflib v1.0.0 // indirect
56-
github.com/sergi/go-diff v1.1.0 // indirect
57-
github.com/src-d/gcfg v1.4.0 // indirect
5850
github.com/stretchr/testify v1.7.0 // indirect
5951
github.com/weppos/publicsuffix-go v0.13.0 // indirect
60-
github.com/xanzy/ssh-agent v0.2.1 // indirect
6152
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
6253
github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21 // indirect
6354
github.com/zmap/zlint/v2 v2.2.1 // indirect
6455
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
65-
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
6656
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
6757
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
6858
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
6959
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7060
google.golang.org/protobuf v1.27.1 // indirect
7161
gopkg.in/inf.v0 v0.9.1 // indirect
72-
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
73-
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
7462
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
75-
gopkg.in/warnings.v0 v0.1.2 // indirect
7663
gopkg.in/yaml.v2 v2.4.0 // indirect
7764
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
7865
k8s.io/api v0.24.0 // indirect

0 commit comments

Comments
 (0)