Skip to content

Commit ffd9d52

Browse files
Disallow untidy go mod in Pull requests (#1575)
1 parent e1d4e62 commit ffd9d52

File tree

4 files changed

+9
-596
lines changed

4 files changed

+9
-596
lines changed

.circleci/continue_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ jobs:
8282
echo "This is not a pull request. Skipping..."
8383
exit 0
8484
fi
85-
make update-generated synchronize-v2alpha1-with-v1 generate-internal fmt yamlfmt
85+
make tidy update-generated synchronize-v2alpha1-with-v1 generate-internal fmt yamlfmt
86+
git checkout -- go.sum # ignore changes in go.sum
8687
if [ ! -z "$(git status --porcelain)" ]; then
8788
echo "There are uncommited changes!"
8889
git status

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ GOBUILDARGS ?=
5151
GOBASEVERSION := 1.21.6
5252
GOVERSION := $(GOBASEVERSION)-alpine3.17
5353
DISTRIBUTION := alpine:3.15
54+
GOCOMPAT := $(shell sed -En 's/^go (.*)$$/\1/p' go.mod)
55+
5456
GOBUILDTAGS := $(RELEASE_MODE)
5557

5658
ifeq ($(TEST_BUILD),1)
@@ -697,7 +699,7 @@ patch-chart:
697699

698700
.PHONY: tidy
699701
tidy:
700-
@go mod tidy -compat=$(GOBASEVERSION)
702+
@go mod tidy -v -compat=$(GOCOMPAT)
701703

702704
.PHONY: deps-reload
703705
deps-reload: tidy init

go.mod

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -68,31 +68,19 @@ require (
6868
)
6969

7070
require (
71-
github.com/NYTimes/gziphandler v1.1.1 // indirect
72-
github.com/PuerkitoBio/purell v1.1.1 // indirect
73-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
74-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
75-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
76-
github.com/arangodb-managed/apis v0.85.0 // indirect
77-
github.com/arangodb-managed/integration-apis v0.1.1 // indirect
7871
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
79-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
8072
github.com/beorn7/perks v1.0.1 // indirect
81-
github.com/blang/semver/v4 v4.0.0 // indirect
8273
github.com/bytedance/sonic v1.9.1 // indirect
8374
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
8475
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8576
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
86-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8777
github.com/davecgh/go-spew v1.1.1 // indirect
8878
github.com/dchest/siphash v1.2.2 // indirect
8979
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
9080
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
91-
github.com/felixge/httpsnoop v1.0.4 // indirect
9281
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
9382
github.com/gin-contrib/sse v0.1.0 // indirect
9483
github.com/go-logr/logr v1.4.1 // indirect
95-
github.com/go-logr/stdr v1.2.2 // indirect
9684
github.com/go-openapi/jsonpointer v0.19.6 // indirect
9785
github.com/go-openapi/jsonreference v0.20.2 // indirect
9886
github.com/go-openapi/swag v0.22.3 // indirect
@@ -103,17 +91,11 @@ require (
10391
github.com/gogo/protobuf v1.3.2 // indirect
10492
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10593
github.com/golang/protobuf v1.5.3 // indirect
106-
github.com/google/cel-go v0.16.1 // indirect
107-
github.com/google/gnostic v0.5.7-v3refs // indirect
10894
github.com/google/gnostic-models v0.6.8 // indirect
10995
github.com/google/go-cmp v0.6.0 // indirect
11096
github.com/google/gofuzz v1.2.0 // indirect
111-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
112-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
113-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
11497
github.com/imdario/mergo v0.3.6 // indirect
11598
github.com/inconshreveable/mousetrap v1.1.0 // indirect
116-
github.com/jmespath/go-jmespath v0.4.0 // indirect
11799
github.com/josharian/intern v1.0.0 // indirect
118100
github.com/json-iterator/go v1.1.12 // indirect
119101
github.com/kkdai/maglev v0.2.0 // indirect
@@ -122,7 +104,6 @@ require (
122104
github.com/mailru/easyjson v0.7.7 // indirect
123105
github.com/mattn/go-isatty v0.0.19 // indirect
124106
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
125-
github.com/mitchellh/mapstructure v1.4.1 // indirect
126107
github.com/moby/spdystream v0.2.0 // indirect
127108
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
128109
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -132,52 +113,21 @@ require (
132113
github.com/pmezard/go-difflib v1.0.0 // indirect
133114
github.com/prometheus/common v0.44.0 // indirect
134115
github.com/prometheus/procfs v0.10.1 // indirect
135-
github.com/stoewer/go-strcase v1.2.0 // indirect
136116
github.com/stretchr/objx v0.4.0 // indirect
137117
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
138118
github.com/ugorji/go/codec v1.2.11 // indirect
139-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
140-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
141-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
142-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
143-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
144-
go.opentelemetry.io/otel v1.21.0 // indirect
145-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
146-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
147-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
148-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
149-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
150-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
151-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
152-
go.uber.org/atomic v1.10.0 // indirect
153-
go.uber.org/multierr v1.11.0 // indirect
154-
go.uber.org/zap v1.19.0 // indirect
155119
golang.org/x/arch v0.3.0 // indirect
156120
golang.org/x/crypto v0.17.0 // indirect
157-
golang.org/x/exp v0.0.0-20230125214544-b3c2aaf6208d // indirect
158-
golang.org/x/mod v0.12.0 // indirect
159121
golang.org/x/net v0.19.0 // indirect
160122
golang.org/x/oauth2 v0.13.0 // indirect
161123
golang.org/x/term v0.15.0 // indirect
162124
golang.org/x/tools v0.12.0 // indirect
163125
google.golang.org/appengine v1.6.8 // indirect
164-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
165-
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect
166126
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
167127
gopkg.in/inf.v0 v0.9.1 // indirect
168-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
169128
gopkg.in/yaml.v2 v2.4.0 // indirect
170-
k8s.io/apiserver v0.28.5 // indirect
171-
k8s.io/cloud-provider v0.28.5 // indirect
172-
k8s.io/cluster-bootstrap v0.28.5 // indirect
173-
k8s.io/code-generator v0.28.5 // indirect
174-
k8s.io/component-base v0.28.5 // indirect
175-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
176129
k8s.io/klog/v2 v2.100.1 // indirect
177-
k8s.io/kms v0.28.5 // indirect
178-
k8s.io/metrics v0.28.5 // indirect
179130
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
180-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
181131
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
182132
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
183133
)

0 commit comments

Comments
 (0)