Skip to content

Commit 4764db9

Browse files
committed
Merge pull request #12160 from avagin:bazel-mod-switch
PiperOrigin-RevId: 811952342
2 parents 525aa49 + d8b7cfc commit 4764db9

File tree

10 files changed

+227
-3690
lines changed

10 files changed

+227
-3690
lines changed

.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,3 @@ build:x86_64 --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
4545
build:aarch64 --crosstool_top=@crosstool//:toolchains
4646
build:aarch64 --cpu=aarch64
4747
build:aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64
48-
49-
common --noenable_bzlmod
50-
common --enable_workspace

MODULE.bazel

Lines changed: 138 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bazel_dep(name = "rules_license", version = "1.0.0")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "rules_pkg", version = "1.0.1")
1111
bazel_dep(name = "rules_cc", version = "0.1.4")
12-
bazel_dep(name = "grpc", version = "1.74.1", repo_name = "com_github_grpc_grpc")
12+
bazel_dep(name = "grpc", version = "1.75.0", repo_name = "com_github_grpc_grpc")
1313
bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
1414
bazel_dep(name = "platforms", version = "1.0.0")
1515
bazel_dep(name = "abseil-cpp", version = "20250512.1", repo_name = "com_google_absl")
@@ -19,6 +19,28 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3")
1919
bazel_dep(name = "rules_python", version = "1.4.0")
2020
bazel_dep(name = "zstd", version = "1.5.5", repo_name = "llvm_zstd")
2121

22+
archive_override(
23+
module_name = "rules_go",
24+
integrity = "sha256-pynI7SRHyQ/hQAd2iQecoKz7dYDsQWN/MS1lDOnZPZY=",
25+
patch_args = ["-p1"],
26+
patches = [
27+
"//tools:rules_go_symbols.patch",
28+
"//tools:rules_go_sdk.patch",
29+
"//tools:rules_cgo.patch",
30+
"//tools:rules_go_export.patch",
31+
],
32+
url = "https://github.com/bazel-contrib/rules_go/releases/download/v0.57.0/rules_go-v0.57.0.zip",
33+
)
34+
35+
archive_override(
36+
module_name = "grpc",
37+
integrity = "sha256-MdbAHDv6CjWEUyZlcV5IdwPrENdrswtIdeV9E5wTu/k=",
38+
patch_args = ["-p1"],
39+
patches = ["//tools:grpc_extra_deps.patch"],
40+
strip_prefix = "grpc-1.75.0",
41+
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.75.0.tar.gz",
42+
)
43+
2244
### LLVM
2345
# TODO: try using "llvm-raw" from BCR
2446
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -41,20 +63,28 @@ python.defaults(python_version = "3.11")
4163
python.toolchain(python_version = "3.11")
4264

4365
### Crosstool
44-
coral_crosstool_extension = use_extension("//:tools/bazeldefs/extensions/coral_crosstool.bzl", "coral_crosstool_extension")
66+
coral_crosstool_extension = use_extension("//tools/bazeldefs:extensions/coral_crosstool.bzl", "coral_crosstool_extension")
4567
use_repo(coral_crosstool_extension, "coral_crosstool")
4668

47-
crosstool = use_extension("//:tools/bazeldefs/extensions/crosstool.bzl", "crosstool_extension")
69+
crosstool = use_extension("//tools/bazeldefs:extensions/crosstool.bzl", "crosstool_extension")
4870
use_repo(crosstool, "crosstool")
4971

5072
### zlib-ng
5173
# TODO: try using "zlib-ng" from BCR
52-
llvm_zlib = use_extension("//:tools/bazeldefs/extensions/llvm_zlib.bzl", "llvm_zlib_extension")
74+
llvm_zlib = use_extension("//tools/bazeldefs:extensions/llvm_zlib.bzl", "llvm_zlib_extension")
5375
use_repo(llvm_zlib, "llvm_zlib")
5476

5577
### Repo rules
5678
http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
5779

80+
new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")
81+
82+
new_local_repository(
83+
name = "libpluginstack",
84+
build_file = "external/tools/plugin-stack/plugin-stack.BUILD",
85+
path = "external/tools/plugin-stack",
86+
)
87+
5888
http_file(
5989
name = "buildkite_pipeline_schema",
6090
sha256 = "3369c58038b4d55c08928affafb653716eb1e7b3cabb4a391aef979dd921f4e1",
@@ -67,14 +97,30 @@ http_file(
6797
urls = ["https://raw.githubusercontent.com/SchemaStore/schemastore/166136b96a14f103a948053903e9339e63ad9170/src/schemas/json/github-workflow.json"],
6898
)
6999

100+
# Root certificates.
101+
#
102+
# Note that the sha256 hash is omitted here intentionally. This should not be
103+
# used in any part of the build other than as certificates present in images.
104+
http_file(
105+
name = "google_root_pem",
106+
sha256 = "0d4b15a365e5158c1f9217b7827c5af8a9b86789e8cfbe21480a57c134fe9d01",
107+
urls = [
108+
"https://pki.goog/roots.pem",
109+
],
110+
)
111+
70112
### Toolchains
71113
register_toolchains("//:cc_toolchain_k8")
72114

73115
register_toolchains("//:cc_toolchain_aarch64")
74116

75117
### Go
76118
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
77-
go_sdk.download(version = "1.24.1")
119+
go_sdk.download(
120+
patch_strip = 1,
121+
patches = ["//tools:go_types_memoize.patch"],
122+
version = "1.24.1",
123+
)
78124

79125
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
80126
go_deps.from_file(go_mod = "//:go.mod")
@@ -98,6 +144,7 @@ use_repo(
98144
"com_github_docker_go_connections",
99145
"com_github_felixge_httpsnoop",
100146
"com_github_go_echarts_go_echarts_v2",
147+
"com_github_go_logr_logr",
101148
"com_github_go_logr_stdr",
102149
"com_github_godbus_dbus_v5",
103150
"com_github_gofrs_flock",
@@ -109,10 +156,12 @@ use_repo(
109156
"com_github_google_go_querystring",
110157
"com_github_google_gopacket",
111158
"com_github_google_pprof",
159+
"com_github_google_s2a_go",
112160
"com_github_google_subcommands",
113161
"com_github_google_uuid",
114162
"com_github_googleapis_enterprise_certificate_proxy",
115163
"com_github_googleapis_gax_go_v2",
164+
"com_github_googleapis_gnostic",
116165
"com_github_hanwen_go_fuse_v2",
117166
"com_github_ianlancetaylor_demangle",
118167
"com_github_imdario_mergo",
@@ -133,6 +182,8 @@ use_repo(
133182
"com_github_xeipuuv_gojsonreference",
134183
"com_github_xeipuuv_gojsonschema",
135184
"com_google_cloud_go",
185+
"com_google_cloud_go_auth",
186+
"com_google_cloud_go_auth_oauth2adapt",
136187
"com_google_cloud_go_bigquery",
137188
"com_google_cloud_go_compute_metadata",
138189
"com_google_cloud_go_container",
@@ -142,6 +193,8 @@ use_repo(
142193
"io_k8s_api",
143194
"io_k8s_apimachinery",
144195
"io_k8s_client_go",
196+
"io_opentelemetry_go_auto_sdk",
197+
"io_opentelemetry_go_contrib_instrumentation_google_golang_org_grpc_otelgrpc",
145198
"io_opentelemetry_go_contrib_instrumentation_net_http_otelhttp",
146199
"io_opentelemetry_go_otel",
147200
"io_opentelemetry_go_otel_metric",
@@ -150,6 +203,7 @@ use_repo(
150203
"org_golang_google_genproto",
151204
"org_golang_google_grpc",
152205
"org_golang_google_protobuf",
206+
"org_golang_x_crypto",
153207
"org_golang_x_exp",
154208
"org_golang_x_exp_typeparams",
155209
"org_golang_x_mod",
@@ -164,25 +218,70 @@ use_repo(
164218
"org_uber_go_multierr",
165219
)
166220

221+
go_deps.module(
222+
path = "cloud.google.com/go/auth",
223+
sum = "h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=",
224+
version = "v0.16.5",
225+
)
226+
go_deps.module(
227+
path = "cloud.google.com/go/auth/oauth2adapt",
228+
sum = "h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=",
229+
version = "v0.2.8",
230+
)
231+
go_deps.module(
232+
path = "github.com/google/s2a-go",
233+
sum = "h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=",
234+
version = "v0.1.9",
235+
)
236+
go_deps.module(
237+
path = "go.opentelemetry.io/auto/sdk",
238+
sum = "h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=",
239+
version = "v1.1.0",
240+
)
241+
go_deps.module(
242+
path = "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc",
243+
sum = "h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=",
244+
version = "v0.61.0",
245+
)
246+
go_deps.module(
247+
path = "golang.org/x/crypto",
248+
sum = "h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=",
249+
version = "v0.42.0",
250+
)
251+
go_deps.module(
252+
path = "golang.org/x/mod",
253+
sum = "h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=",
254+
version = "v0.28.0",
255+
)
256+
go_deps.module(
257+
path = "golang.org/x/sync",
258+
sum = "h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=",
259+
version = "v0.17.0",
260+
)
261+
go_deps.module(
262+
path = "golang.org/x/sys",
263+
sum = "h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=",
264+
version = "v0.36.0",
265+
)
266+
go_deps.module(
267+
path = "golang.org/x/tools",
268+
sum = "h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=",
269+
version = "v0.37.0",
270+
)
167271
go_deps.module(
168272
path = "golang.org/x/term",
169-
sum = "h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=",
170-
version = "v0.16.0",
273+
sum = "h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=",
274+
version = "v0.35.0",
171275
)
172276
go_deps.module(
173277
path = "golang.org/x/net",
174-
sum = "h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=",
175-
version = "v0.30.0",
278+
sum = "h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=",
279+
version = "v0.44.0",
176280
)
177281
go_deps.module(
178282
path = "github.com/google/go-cmp",
179-
sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
180-
version = "v0.5.9",
181-
)
182-
go_deps.module(
183-
path = "github.com/golang/protobuf",
184-
sum = "h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=",
185-
version = "v1.5.3",
283+
sum = "h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=",
284+
version = "v0.7.0",
186285
)
187286
go_deps.module(
188287
path = "github.com/xeipuuv/gojsonpointer",
@@ -191,14 +290,19 @@ go_deps.module(
191290
)
192291
go_deps.module(
193292
path = "go.opentelemetry.io/otel",
194-
sum = "h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=",
195-
version = "v1.28.0",
293+
sum = "h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=",
294+
version = "v1.37.0",
196295
)
197296
go_deps.module(
198297
path = "github.com/go-logr/stdr",
199298
sum = "h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=",
200299
version = "v1.2.2",
201300
)
301+
go_deps.module(
302+
path = "github.com/go-logr/logr",
303+
sum = "h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=",
304+
version = "v1.4.3",
305+
)
202306
go_deps.module(
203307
path = "go.opentelemetry.io/otel/metric",
204308
sum = "h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=",
@@ -256,8 +360,8 @@ go_deps.module(
256360
)
257361
go_deps.module(
258362
path = "cloud.google.com/go/compute/metadata",
259-
sum = "h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=",
260-
version = "v0.2.3",
363+
sum = "h1:HxMRIbao8w17ZX6wBnjhcDkW6lTFpgcaobyVfZWqRLA=",
364+
version = "v0.8.0",
261365
)
262366
go_deps.module(
263367
path = "cloud.google.com/go/container",
@@ -291,8 +395,8 @@ go_deps.module(
291395
)
292396
go_deps.module(
293397
path = "github.com/googleapis/enterprise-certificate-proxy",
294-
sum = "h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=",
295-
version = "v0.2.0",
398+
sum = "h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=",
399+
version = "v0.3.6",
296400
)
297401
go_deps.module(
298402
path = "github.com/google/gopacket",
@@ -326,8 +430,8 @@ go_deps.module(
326430
)
327431
go_deps.module(
328432
path = "golang.org/x/oauth2",
329-
sum = "h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=",
330-
version = "v0.23.0",
433+
sum = "h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=",
434+
version = "v0.30.0",
331435
)
332436
go_deps.module(
333437
path = "gopkg.in/yaml.v3",
@@ -336,13 +440,13 @@ go_deps.module(
336440
)
337441
go_deps.module(
338442
path = "google.golang.org/genproto",
339-
sum = "h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU=",
340-
version = "v0.0.0-20241021214115-324edc3d5d38",
443+
sum = "h1:FGOcxvKlJgRBVbXeugjljCfCgfKWhC42FBoYmTCWVBs=",
444+
version = "v0.0.0-20250707201910-8d1bb00bc6a7",
341445
)
342446
go_deps.module(
343447
path = "google.golang.org/grpc",
344-
sum = "h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=",
345-
version = "v1.67.1",
448+
sum = "h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=",
449+
version = "v1.75.1",
346450
)
347451
go_deps.module(
348452
path = "github.com/docker/go-connections",
@@ -351,8 +455,8 @@ go_deps.module(
351455
)
352456
go_deps.module(
353457
path = "github.com/googleapis/gax-go/v2",
354-
sum = "h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=",
355-
version = "v2.7.0",
458+
sum = "h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=",
459+
version = "v2.15.0",
356460
)
357461
go_deps.module(
358462
path = "github.com/ianlancetaylor/demangle",
@@ -381,8 +485,8 @@ go_deps.module(
381485
)
382486
go_deps.module(
383487
path = "google.golang.org/api",
384-
sum = "h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ=",
385-
version = "v0.103.0",
488+
sum = "h1:0VrsWAKzIZi058aeq+I86uIXbNhm9GxSHpbmZ92a38w=",
489+
version = "v0.249.0",
386490
)
387491
go_deps.module(
388492
path = "gopkg.in/yaml.v2",
@@ -391,8 +495,8 @@ go_deps.module(
391495
)
392496
go_deps.module(
393497
path = "github.com/golang/protobuf",
394-
sum = "h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=",
395-
version = "v1.5.3",
498+
sum = "h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=",
499+
version = "v1.5.4",
396500
)
397501
go_deps.module(
398502
path = "github.com/imdario/mergo",

0 commit comments

Comments
 (0)