mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-02-22 16:00:05 -05:00
deps: update bazel (core) (#3581)
* deps: update bazel (core) * bazel: depset -> list To comply with some breaking changes in rules_go v0.51, we explicitly need to type-cast the depsets to lists here. * bazel: migrate deprecated GoLibrary usage In rules_go v0.51.0, `GoLibrary` was deprecated and replaced by `GoInfo`. This adjusts our `protoc-gen-go` rule to use the new `GoInfo`. * deps: tidy all modules --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> Co-authored-by: edgelessci <edgelessci@users.noreply.github.com>
This commit is contained in:
parent
53e937522f
commit
22d093cc6f
@ -8,10 +8,10 @@ use_repo(bazel_lib, "jq_toolchains")
|
||||
use_repo(bazel_lib, "yq_toolchains")
|
||||
|
||||
bazel_dep(name = "bazel_skylib", version = "1.7.1")
|
||||
bazel_dep(name = "gazelle", version = "0.40.0")
|
||||
bazel_dep(name = "gazelle", version = "0.41.0")
|
||||
bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.1")
|
||||
bazel_dep(name = "rules_cc", version = "0.1.0")
|
||||
bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")
|
||||
bazel_dep(name = "rules_go", version = "0.52.0", repo_name = "io_bazel_rules_go")
|
||||
bazel_dep(name = "rules_pkg", version = "1.0.1")
|
||||
bazel_dep(name = "rules_proto", version = "7.1.0")
|
||||
bazel_dep(name = "rules_python", version = "1.1.0")
|
||||
|
10
MODULE.bazel.lock
generated
10
MODULE.bazel.lock
generated
@ -46,8 +46,8 @@
|
||||
"https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.36.0/MODULE.bazel": "e375d5d6e9a6ca59b0cb38b0540bc9a05b6aa926d322f2de268ad267a2ee74c0",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.40.0/MODULE.bazel": "42ba5378ebe845fca43989a53186ab436d956db498acde790685fe0e8f9c6146",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.40.0/source.json": "1e5ef6e4d8b9b6836d93273c781e78ff829ea2e077afef7a57298040fa4f010a",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.41.0/MODULE.bazel": "fdce8a8f5129d5b6d693d91cb191d0a014fdcb88e9094e528325a7165de2a826",
|
||||
"https://bcr.bazel.build/modules/gazelle/0.41.0/source.json": "bc00c665344d775b5cae6064608262e0478789c523677d40eef8f85031c6bfda",
|
||||
"https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
|
||||
"https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
|
||||
"https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
|
||||
@ -100,7 +100,8 @@
|
||||
"https://bcr.bazel.build/modules/rules_go/0.42.0/MODULE.bazel": "8cfa875b9aa8c6fce2b2e5925e73c1388173ea3c32a0db4d2b4804b453c14270",
|
||||
"https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd",
|
||||
"https://bcr.bazel.build/modules/rules_go/0.50.1/MODULE.bazel": "b91a308dc5782bb0a8021ad4330c81fea5bda77f96b9e4c117b9b9c8f6665ee0",
|
||||
"https://bcr.bazel.build/modules/rules_go/0.50.1/source.json": "205765fd30216c70321f84c9a967267684bdc74350af3f3c46c857d9f80a4fa2",
|
||||
"https://bcr.bazel.build/modules/rules_go/0.52.0/MODULE.bazel": "0cf080a2706aa8fc9abf64286cee60fdf0238db37b7f1793b0f7d550d59ea3ae",
|
||||
"https://bcr.bazel.build/modules/rules_go/0.52.0/source.json": "441bc7591044993dce9fb0377fcadf3086d6afac621b909d17d53858a4a1b8d4",
|
||||
"https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
|
||||
"https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
|
||||
"https://bcr.bazel.build/modules/rules_java/6.3.0/MODULE.bazel": "a97c7678c19f236a956ad260d59c86e10a463badb7eb2eda787490f4c969b963",
|
||||
@ -144,7 +145,8 @@
|
||||
"https://bcr.bazel.build/modules/rules_python/1.1.0/MODULE.bazel": "57e01abae22956eb96d891572490d20e07d983e0c065de0b2170cafe5053e788",
|
||||
"https://bcr.bazel.build/modules/rules_python/1.1.0/source.json": "29f1fdfd23a40808c622f813bc93e29c3aae277333f03293f667e76159750a0f",
|
||||
"https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
|
||||
"https://bcr.bazel.build/modules/rules_shell/0.2.0/source.json": "7f27af3c28037d9701487c4744b5448d26537cc66cdef0d8df7ae85411f8de95",
|
||||
"https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b",
|
||||
"https://bcr.bazel.build/modules/rules_shell/0.3.0/source.json": "c55ed591aa5009401ddf80ded9762ac32c358d2517ee7820be981e2de9756cf3",
|
||||
"https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
|
||||
"https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
|
||||
"https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd",
|
||||
|
@ -14,7 +14,7 @@ def _ensure_target_cfg(ctx):
|
||||
def _go_bin_for_host_impl(ctx):
|
||||
_ensure_target_cfg(ctx)
|
||||
sdk = ctx.toolchains[GO_TOOLCHAIN].sdk
|
||||
sdk_files = ctx.runfiles([sdk.go] + sdk.headers + sdk.libs + sdk.srcs + sdk.tools)
|
||||
sdk_files = ctx.runfiles([sdk.go] + sdk.headers.to_list() + sdk.libs.to_list() + sdk.srcs.to_list() + sdk.tools.to_list())
|
||||
return [
|
||||
DefaultInfo(
|
||||
files = depset([sdk.go]),
|
||||
|
@ -5,17 +5,14 @@ based on https://github.com/bazelbuild/rules_go/issues/2111#issuecomment-1355927
|
||||
"""
|
||||
|
||||
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
|
||||
load("@io_bazel_rules_go//go:def.bzl", "GoLibrary", "go_context")
|
||||
load("@io_bazel_rules_go//go:def.bzl", "GoInfo")
|
||||
load("@io_bazel_rules_go//proto:compiler.bzl", "GoProtoCompiler")
|
||||
|
||||
def _output_go_library_srcs_impl(ctx):
|
||||
go = go_context(ctx)
|
||||
|
||||
srcs_of_library = []
|
||||
importpath = ""
|
||||
for src in ctx.attr.deps:
|
||||
lib = src[GoLibrary]
|
||||
go_src = go.library_to_source(go, ctx.attr, lib, False)
|
||||
lib = src[GoInfo]
|
||||
if importpath and lib.importpath != importpath:
|
||||
fail(
|
||||
"importpath of all deps must match, got {} and {}",
|
||||
@ -23,7 +20,7 @@ def _output_go_library_srcs_impl(ctx):
|
||||
lib.importpath,
|
||||
)
|
||||
importpath = lib.importpath
|
||||
srcs_of_library.extend(go_src.srcs)
|
||||
srcs_of_library.extend(lib.srcs)
|
||||
|
||||
if len(srcs_of_library) != 1:
|
||||
fail("expected exactly one src for library, got {}", len(srcs_of_library))
|
||||
@ -54,7 +51,7 @@ output_go_library_srcs = rule(
|
||||
default = "@io_bazel_rules_go//proto:go_proto",
|
||||
),
|
||||
"deps": attr.label_list(
|
||||
providers = [GoLibrary],
|
||||
providers = [GoInfo],
|
||||
aspects = [],
|
||||
),
|
||||
"out": attr.output(
|
||||
|
2
go.mod
2
go.mod
@ -56,7 +56,7 @@ require (
|
||||
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.6
|
||||
github.com/aws/smithy-go v1.22.1
|
||||
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44
|
||||
github.com/bazelbuild/rules_go v0.50.1
|
||||
github.com/bazelbuild/rules_go v0.52.0
|
||||
github.com/coreos/go-systemd/v22 v22.5.0
|
||||
github.com/docker/docker v27.3.1+incompatible
|
||||
github.com/edgelesssys/go-azguestattestation v0.0.0-20240513062303-05f8770a633d
|
||||
|
4
go.sum
4
go.sum
@ -190,8 +190,8 @@ github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
|
||||
github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
|
||||
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44 h1:FGzENZi+SX9I7h9xvMtRA3rel8hCEfyzSixteBgn7MU=
|
||||
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg=
|
||||
github.com/bazelbuild/rules_go v0.50.1 h1:/BUvuaB8MEiUA2oLPPCGtuw5V+doAYyiGTFyoSWlkrw=
|
||||
github.com/bazelbuild/rules_go v0.50.1/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs=
|
||||
github.com/bazelbuild/rules_go v0.52.0 h1:+ozpngVAW67pCAwfhepaXSSrG3yHcj8K9hNAxSYBno4=
|
||||
github.com/bazelbuild/rules_go v0.52.0/go.mod h1:M+YrupNArA7OiTlv++rFUgQ6Sm+ZXbQ5HPUj0cGa0us=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
|
Loading…
x
Reference in New Issue
Block a user