Skip to content

Commit 262c28f

Browse files
committed
deps(gazelle): Bump rules_go from 0.41.0 to 0.55.0
Bump `rules_go` from 0.41.0 to 0.55.0 Fixes #2956. + Run `go get github.com/bazelbuild/[email protected]` for version bump. + Run `go mod tidy` to clean up stale deps + Run `bazel run //:gazelle_update_repos` + Figure out http_archive hashes and apply them for WORKSPACE users. + Also bump bazel-gazelle to address a warning: + `go get github.com/bazelbuild/[email protected]` + > Mismatch between versions requested for module > github.com/bazelbuild/bazel-gazelle > Bazel dependency version requested in MODULE.bazel: 0.40.0 > Go module version requested in go.mod: 0.31.1 > Please resolve this mismatch to prevent discrepancies between > native Go and Bazel builds + Update CHANGELOG.md accordingly
1 parent 0498664 commit 262c28f

File tree

10 files changed

+98
-264
lines changed

10 files changed

+98
-264
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ END_UNRELEASED_TEMPLATE
7272
* (py_wheel) py_wheel always creates zip64-capable wheel zips
7373
* (providers) (experimental) {obj}`PyInfo.venv_symlinks` replaces
7474
`PyInfo.site_packages_symlinks`
75+
* (deps) Upgrade `rules_go` 0.41.0 -> 0.55.0. Note that this might result in a slight
76+
reordering of load statements in gazelle-generated `BUILD(.bazel)` files.
7577

7678
{#v0-0-0-fixed}
7779
### Fixed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bazel_dep(name = "other", version = "0", dev_dependency = True)
8989

9090
# Extra gazelle plugin deps so that WORKSPACE.bzlmod can continue including it for e2e tests.
9191
# We use `WORKSPACE.bzlmod` because it is impossible to have dev-only local overrides.
92-
bazel_dep(name = "rules_go", version = "0.41.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
92+
bazel_dep(name = "rules_go", version = "0.55.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
9393
bazel_dep(name = "rules_python_gazelle_plugin", version = "0", dev_dependency = True)
9494
bazel_dep(name = "gazelle", version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle")
9595

examples/build_file_generation/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2020

2121
http_archive(
2222
name = "io_bazel_rules_go",
23-
sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
23+
sha256 = "c6cf9da6668ac84c470c43cbfccb8fdc844ead2b5a8b918e2816d44f2986f644",
2424
urls = [
25-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
26-
"https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
25+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
26+
"https://github.com/bazelbuild/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
2727
],
2828
)
2929

gazelle/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module(
66

77
bazel_dep(name = "bazel_skylib", version = "1.6.1")
88
bazel_dep(name = "rules_python", version = "0.18.0")
9-
bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")
9+
bazel_dep(name = "rules_go", version = "0.55.0", repo_name = "io_bazel_rules_go")
1010
bazel_dep(name = "gazelle", version = "0.33.0", repo_name = "bazel_gazelle")
1111
bazel_dep(name = "rules_cc", version = "0.0.16")
1212

gazelle/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ http_archive(
66
name = "io_bazel_rules_go",
77
sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
88
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
10-
"https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
9+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
10+
"https://github.com/bazelbuild/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
1111
],
1212
)
1313

gazelle/deps.bzl

Lines changed: 58 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -37,157 +37,91 @@ def gazelle_deps():
3737

3838
def go_deps():
3939
"Fetch go dependencies"
40-
go_repository(
41-
name = "co_honnef_go_tools",
42-
importpath = "honnef.co/go/tools",
43-
sum = "h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=",
44-
version = "v0.0.0-20190523083050-ea95bdfd59fc",
45-
)
4640
go_repository(
4741
name = "com_github_bazelbuild_bazel_gazelle",
4842
importpath = "github.com/bazelbuild/bazel-gazelle",
49-
sum = "h1:ROyUyUHzoEdvoOs1e0haxJx1l5EjZX6AOqiKdVlaBbg=",
50-
version = "v0.31.1",
43+
sum = "h1:SAYys3KRG5i3KTgQAvO423bLT1rQMSgqEKReMkM/CW0=",
44+
version = "v0.40.0",
5145
)
52-
5346
go_repository(
5447
name = "com_github_bazelbuild_buildtools",
5548
build_naming_convention = "go_default_library",
5649
importpath = "github.com/bazelbuild/buildtools",
57-
sum = "h1:HTepWP/jhtWTC1gvK0RnvKCgjh4gLqiwaOwGozAXcbw=",
58-
version = "v0.0.0-20231103205921-433ea8554e82",
50+
sum = "h1:FGzENZi+SX9I7h9xvMtRA3rel8hCEfyzSixteBgn7MU=",
51+
version = "v0.0.0-20240918101019-be1c24cc9a44",
5952
)
6053
go_repository(
6154
name = "com_github_bazelbuild_rules_go",
6255
importpath = "github.com/bazelbuild/rules_go",
63-
sum = "h1:JzlRxsFNhlX+g4drDRPhIaU5H5LnI978wdMJ0vK4I+k=",
64-
version = "v0.41.0",
56+
sum = "h1:S8X/b/Oygw/Dtv7NuyW7ht0QwdynMEdXQqYigX5A1KY=",
57+
version = "v0.55.0",
6558
)
66-
6759
go_repository(
6860
name = "com_github_bmatcuk_doublestar_v4",
6961
importpath = "github.com/bmatcuk/doublestar/v4",
7062
sum = "h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=",
7163
version = "v4.7.1",
7264
)
73-
74-
go_repository(
75-
name = "com_github_burntsushi_toml",
76-
importpath = "github.com/BurntSushi/toml",
77-
sum = "h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=",
78-
version = "v0.3.1",
79-
)
80-
go_repository(
81-
name = "com_github_census_instrumentation_opencensus_proto",
82-
importpath = "github.com/census-instrumentation/opencensus-proto",
83-
sum = "h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=",
84-
version = "v0.2.1",
85-
)
86-
go_repository(
87-
name = "com_github_chzyer_logex",
88-
importpath = "github.com/chzyer/logex",
89-
sum = "h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=",
90-
version = "v1.1.10",
91-
)
92-
go_repository(
93-
name = "com_github_chzyer_readline",
94-
importpath = "github.com/chzyer/readline",
95-
sum = "h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=",
96-
version = "v0.0.0-20180603132655-2972be24d48e",
97-
)
98-
go_repository(
99-
name = "com_github_chzyer_test",
100-
importpath = "github.com/chzyer/test",
101-
sum = "h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=",
102-
version = "v0.0.0-20180213035817-a1ea475d72b1",
103-
)
104-
go_repository(
105-
name = "com_github_client9_misspell",
106-
importpath = "github.com/client9/misspell",
107-
sum = "h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=",
108-
version = "v0.3.4",
109-
)
11065
go_repository(
11166
name = "com_github_davecgh_go_spew",
11267
importpath = "github.com/davecgh/go-spew",
11368
sum = "h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=",
11469
version = "v1.1.1",
11570
)
116-
71+
go_repository(
72+
name = "com_github_dougthor42_go_tree_sitter",
73+
importpath = "github.com/dougthor42/go-tree-sitter",
74+
sum = "h1:b9s96BulIARx0konX36sJ5oZhWvAvjQBBntxp1eUukQ=",
75+
version = "v0.0.0-20241210060307-2737e1d0de6b",
76+
)
11777
go_repository(
11878
name = "com_github_emirpasic_gods",
11979
importpath = "github.com/emirpasic/gods",
12080
sum = "h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=",
12181
version = "v1.18.1",
12282
)
123-
go_repository(
124-
name = "com_github_envoyproxy_go_control_plane",
125-
importpath = "github.com/envoyproxy/go-control-plane",
126-
sum = "h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w=",
127-
version = "v0.9.1-0.20191026205805-5f8ba28d4473",
128-
)
129-
go_repository(
130-
name = "com_github_envoyproxy_protoc_gen_validate",
131-
importpath = "github.com/envoyproxy/protoc-gen-validate",
132-
sum = "h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=",
133-
version = "v0.1.0",
134-
)
13583
go_repository(
13684
name = "com_github_fsnotify_fsnotify",
13785
importpath = "github.com/fsnotify/fsnotify",
138-
sum = "h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=",
139-
version = "v1.6.0",
86+
sum = "h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=",
87+
version = "v1.8.0",
14088
)
141-
14289
go_repository(
14390
name = "com_github_ghodss_yaml",
14491
importpath = "github.com/ghodss/yaml",
14592
sum = "h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=",
14693
version = "v1.0.0",
14794
)
14895
go_repository(
149-
name = "com_github_golang_glog",
150-
importpath = "github.com/golang/glog",
151-
sum = "h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=",
152-
version = "v0.0.0-20160126235308-23def4e6c14b",
96+
name = "com_github_gogo_protobuf",
97+
importpath = "github.com/gogo/protobuf",
98+
sum = "h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=",
99+
version = "v1.3.2",
153100
)
154101
go_repository(
155102
name = "com_github_golang_mock",
156103
importpath = "github.com/golang/mock",
157-
sum = "h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=",
158-
version = "v1.6.0",
104+
sum = "h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=",
105+
version = "v1.7.0-rc.1",
159106
)
160107
go_repository(
161108
name = "com_github_golang_protobuf",
162109
importpath = "github.com/golang/protobuf",
163-
sum = "h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=",
164-
version = "v1.5.2",
110+
sum = "h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=",
111+
version = "v1.5.4",
165112
)
166113
go_repository(
167114
name = "com_github_google_go_cmp",
168115
importpath = "github.com/google/go-cmp",
169-
sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
170-
version = "v0.5.9",
116+
sum = "h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=",
117+
version = "v0.6.0",
171118
)
172119
go_repository(
173120
name = "com_github_pmezard_go_difflib",
174121
importpath = "github.com/pmezard/go-difflib",
175122
sum = "h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=",
176123
version = "v1.0.0",
177124
)
178-
179-
go_repository(
180-
name = "com_github_prometheus_client_model",
181-
importpath = "github.com/prometheus/client_model",
182-
sum = "h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=",
183-
version = "v0.0.0-20190812154241-14fe0d1b01d4",
184-
)
185-
go_repository(
186-
name = "com_github_dougthor42_go_tree_sitter",
187-
importpath = "github.com/dougthor42/go-tree-sitter",
188-
sum = "h1:b9s96BulIARx0konX36sJ5oZhWvAvjQBBntxp1eUukQ=",
189-
version = "v0.0.0-20241210060307-2737e1d0de6b",
190-
)
191125
go_repository(
192126
name = "com_github_stretchr_objx",
193127
importpath = "github.com/stretchr/objx",
@@ -200,19 +134,6 @@ def go_deps():
200134
sum = "h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=",
201135
version = "v1.9.0",
202136
)
203-
204-
go_repository(
205-
name = "com_github_yuin_goldmark",
206-
importpath = "github.com/yuin/goldmark",
207-
sum = "h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=",
208-
version = "v1.4.13",
209-
)
210-
go_repository(
211-
name = "com_google_cloud_go",
212-
importpath = "cloud.google.com/go",
213-
sum = "h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=",
214-
version = "v0.26.0",
215-
)
216137
go_repository(
217138
name = "in_gopkg_check_v1",
218139
importpath = "gopkg.in/check.v1",
@@ -231,103 +152,84 @@ def go_deps():
231152
sum = "h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=",
232153
version = "v3.0.1",
233154
)
234-
235155
go_repository(
236156
name = "net_starlark_go",
237157
importpath = "go.starlark.net",
238158
sum = "h1:xwwDQW5We85NaTk2APgoN9202w/l0DVGp+GZMfsrh7s=",
239159
version = "v0.0.0-20210223155950-e043a3d3c984",
240160
)
241-
go_repository(
242-
name = "org_golang_google_appengine",
243-
importpath = "google.golang.org/appengine",
244-
sum = "h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=",
245-
version = "v1.4.0",
246-
)
247161
go_repository(
248162
name = "org_golang_google_genproto",
249163
importpath = "google.golang.org/genproto",
250-
sum = "h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=",
251-
version = "v0.0.0-20200526211855-cb27e3aa2013",
164+
sum = "h1:387Y+JbxF52bmesc8kq1NyYIp33dnxCw6eiA7JMsTmw=",
165+
version = "v0.0.0-20250115164207-1a7da9e5054f",
252166
)
253167
go_repository(
254-
name = "org_golang_google_grpc",
255-
importpath = "google.golang.org/grpc",
256-
sum = "h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=",
257-
version = "v1.50.0",
258-
)
259-
go_repository(
260-
name = "org_golang_google_protobuf",
261-
importpath = "google.golang.org/protobuf",
262-
sum = "h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=",
263-
version = "v1.28.0",
168+
name = "org_golang_google_genproto_googleapis_rpc",
169+
importpath = "google.golang.org/genproto/googleapis/rpc",
170+
sum = "h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=",
171+
version = "v0.0.0-20250106144421-5f5ef82da422",
264172
)
265173
go_repository(
266-
name = "org_golang_x_crypto",
267-
importpath = "golang.org/x/crypto",
268-
sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=",
269-
version = "v0.0.0-20190308221718-c2843e01d9a2",
174+
name = "org_golang_google_grpc",
175+
importpath = "google.golang.org/grpc",
176+
sum = "h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=",
177+
version = "v1.67.3",
270178
)
271179
go_repository(
272-
name = "org_golang_x_exp",
273-
importpath = "golang.org/x/exp",
274-
sum = "h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=",
275-
version = "v0.0.0-20190121172915-509febef88a4",
180+
name = "org_golang_google_grpc_cmd_protoc_gen_go_grpc",
181+
importpath = "google.golang.org/grpc/cmd/protoc-gen-go-grpc",
182+
sum = "h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=",
183+
version = "v1.5.1",
276184
)
277185
go_repository(
278-
name = "org_golang_x_lint",
279-
importpath = "golang.org/x/lint",
280-
sum = "h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=",
281-
version = "v0.0.0-20190313153728-d0100b6bd8b3",
186+
name = "org_golang_google_protobuf",
187+
importpath = "google.golang.org/protobuf",
188+
sum = "h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=",
189+
version = "v1.36.3",
282190
)
283191
go_repository(
284192
name = "org_golang_x_mod",
285193
importpath = "golang.org/x/mod",
286-
sum = "h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=",
287-
version = "v0.10.0",
194+
sum = "h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=",
195+
version = "v0.23.0",
288196
)
289197
go_repository(
290198
name = "org_golang_x_net",
291199
importpath = "golang.org/x/net",
292-
sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
293-
version = "v0.10.0",
294-
)
295-
go_repository(
296-
name = "org_golang_x_oauth2",
297-
importpath = "golang.org/x/oauth2",
298-
sum = "h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=",
299-
version = "v0.0.0-20180821212333-d2e6202438be",
200+
sum = "h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=",
201+
version = "v0.35.0",
300202
)
301203
go_repository(
302204
name = "org_golang_x_sync",
303205
importpath = "golang.org/x/sync",
304-
sum = "h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=",
305-
version = "v0.2.0",
206+
sum = "h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=",
207+
version = "v0.11.0",
306208
)
307209
go_repository(
308210
name = "org_golang_x_sys",
309211
importpath = "golang.org/x/sys",
310-
sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
311-
version = "v0.8.0",
212+
sum = "h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=",
213+
version = "v0.30.0",
312214
)
313215
go_repository(
314216
name = "org_golang_x_text",
315217
importpath = "golang.org/x/text",
316-
sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
317-
version = "v0.3.3",
218+
sum = "h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=",
219+
version = "v0.22.0",
318220
)
319221
go_repository(
320222
name = "org_golang_x_tools",
321223
build_directives = [
322224
"gazelle:exclude **/testdata/**/*",
323225
],
324226
importpath = "golang.org/x/tools",
325-
sum = "h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=",
326-
version = "v0.9.1",
227+
sum = "h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=",
228+
version = "v0.30.0",
327229
)
328230
go_repository(
329-
name = "org_golang_x_xerrors",
330-
importpath = "golang.org/x/xerrors",
331-
sum = "h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=",
332-
version = "v0.0.0-20200804184101-5ec99f83aff1",
231+
name = "org_golang_x_tools_go_vcs",
232+
importpath = "golang.org/x/tools/go/vcs",
233+
sum = "h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4=",
234+
version = "v0.1.0-deprecated",
333235
)

0 commit comments

Comments
 (0)