Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ single_version_override(
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
bazel_dep(name = "rules_cc", version = "0.2.0")
bazel_dep(name = "rules_foreign_cc", version = "0.12.0")
bazel_dep(name = "rules_go", version = "0.56.1")
bazel_dep(name = "rules_go", version = "0.59.0")
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.5.1")
Expand Down Expand Up @@ -226,20 +226,20 @@ COMPILERS = {
# Go Toolchain
# ====================================
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
go_sdk.download(version = "1.24.3")
go_sdk.download(version = "1.25.7")

# The microsoft compiler versions can be listed at their github release under the `asset.json` file
go_sdk.download(
name = "go_sdk_with_systemcrypto",
experiments = ["systemcrypto"],
sdks = {
"linux_amd64": ("dfb7c8bd6b64c9fa9debd6efa724c609/go1.24.3-20250506.3.linux-amd64.tar.gz", "d1e9e4465951816b556f648dfebc1cf20fdef4832d7d3f01f1ef35a259375286"),
"linux_arm64": ("e4d43c57efd1a31cf8673bf43aa69412/go1.24.3-20250506.3.linux-arm64.tar.gz", "6d4232da7ca7d2bd19e0b6b69524448de8e5480f49e5d39f7a5507cef682a9ea"),
"darwin_amd64": ("a6a4d462a5d8a7be72e3222c112d2101/go1.24.3-20250506.3.darwin-amd64.tar.gz", "1f1d8e1537c4a8049e6f049a861c05d9709f7627178df36cb176872a2546fb7c"),
"darwin_arm64": ("02acaf96922416da68a7b15764e56e3c/go1.24.3-20250506.3.darwin-arm64.tar.gz", "330cb681a69cd32465b9e5381e1127eba3184a19d29e9216a9f36383f1bedff0"),
"linux_amd64": ("b6ae036e2c246d52bd15d5300994c8ee/go1.25.7-20260204.4.linux-amd64.tar.gz", "328b235ebd36ddc92c852b6d25b01d8e9478c2779bbbac3c8964890118a8aa6f"),
"linux_arm64": ("218094e73bfc123b8065805487bd52fa/go1.25.7-20260204.4.linux-arm64.tar.gz", "73c5ffdedf6cf5ec57eb2478a64ab50a363e17cb1f53e37049d4a42b2886f939"),
"darwin_amd64": ("16503ff2f5ff30261b0602f647300571/go1.25.7-20260204.4.darwin-amd64.tar.gz", "3cca680b5619449e436a15e4d799d6ae3c4e79616637b4c6fadc0b186df8e61a"),
"darwin_arm64": ("cda77c95a10a9e64d75094d1cdc79d03/go1.25.7-20260204.4.darwin-arm64.tar.gz", "e8ebdd66099a1e216adb643355f040416cd27077c2215681f9e7419d98266679"),
},
urls = ["https://download.visualstudio.microsoft.com/download/pr/18982fcf-1155-40cc-bf0e-4b7564f22251/{}"],
version = "1.24.3",
urls = ["https://download.visualstudio.microsoft.com/download/pr/39e12277-1463-47e4-9f91-f71f8c450c61/{}"],
version = "1.25.7",
)

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
Expand Down
7 changes: 4 additions & 3 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions bazel/clang_tidy/clang_tidy.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@ def is_c_translation_unit(src, tags):
return src.extension == "c"

def _clang_tidy_aspect_impl(target, ctx):
# if not a C/C++ target, we are not interested
if not CcInfo in target:
return []

# Ignore external targets
if target.label.workspace_root.startswith("external"):
return []
Expand Down Expand Up @@ -304,6 +300,7 @@ clang_tidy_aspect = aspect(
"_clang_tidy_config": attr.label(default = Label("//:clang_tidy_config")),
"_clang_tidy_plugins": attr.label(default = Label("//bazel/clang_tidy/plugins:plugins.so")),
},
required_providers = [[CcInfo]],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rockwotj 👀

rules_go had to be bumped from 0.56.1 to 0.59.0 because the older version didn't support Go 1.25.

Apparently, the newer rules_go changed how goos/goarch cross-compilation works. I was getting this error:

  ERROR: Analysis of aspects '[//bazel/clang_tidy:clang_tidy.bzl%clang_tidy_aspect] with parameters {} on
  //src/transform-sdk/go/transform/internal/testdata/setup-panic:setup-panic' failed; build aborted: No
  matching toolchains found for types:
    @@bazel_tools//tools/python:toolchain_type
    @@bazel_tools//tools/cpp:toolchain_type
  To debug, rerun with --toolchain_resolution_debug='@@bazel_tools//tools/python:toolchain_type|@@bazel_too
  ls//tools/cpp:toolchain_type'
  For more information on platforms or toolchains see https://bazel.build/concepts/platforms-intro.

So I added required_providers = [[CcInfo]] to the aspect and make it skip non-C++ targets, but I wonder if this is expected/ok for you/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm fine with this as it doesn't break the existing targets. We could probably remove the if not CcInfo in target line in the aspect if we do this approach

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toolchains = [
"@bazel_tools//tools/cpp:toolchain_type",
"@rules_python//python:toolchain_type",
Expand Down
2 changes: 1 addition & 1 deletion bazel/thirdparty/go.work
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This should match what is listed in MODULE.bazel
go 1.24.3
go 1.25.7

// Everything we build with Bazel goes here.
use (
Expand Down
4 changes: 2 additions & 2 deletions src/go/rpk/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/redpanda-data/redpanda/src/go/rpk

go 1.24.3
go 1.25.7

// add the git commit hash as the target version and `go mod tidy` will transform it into pseudo-version
replace github.com/hamba/avro/v2 => github.com/redpanda-data/go-avro/v2 v2.0.0-20240405204525-77b1144dc525
Expand Down Expand Up @@ -73,7 +73,7 @@ require (
go.uber.org/zap v1.27.1
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
golang.org/x/sync v0.17.0
golang.org/x/sys v0.37.0
golang.org/x/sys v0.38.0
golang.org/x/term v0.36.0
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d
Expand Down
4 changes: 2 additions & 2 deletions src/go/rpk/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
Expand Down
10 changes: 5 additions & 5 deletions src/go/rpk/pkg/cli/transform/buildpack/buildpack.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ import (

var Tinygo = Buildpack{
Name: "tinygo",
baseURL: "https://github.com/tinygo-org/tinygo/releases/download/v0.37.0/tinygo0.37.0",
baseURL: "https://github.com/tinygo-org/tinygo/releases/download/v0.40.1/tinygo0.40.1",
template: "{{.BaseURL}}.{{.GOOS}}-{{.GOARCH}}.tar.gz",
shaSums: map[string]map[string]string{
"darwin": {
"amd64": "90961d9302e147ccb296d0afb800f4fe3c65df9dcc08b470003f6bf130870508",
"arm64": "54e6d952164181a122dd98658da9f187b54a3e18eb767856945196dd46621754",
"amd64": "36c9423a63f9548d142908b06c67e198d878a0fed076b8ec5dbf8a3350a73eb4",
"arm64": "a20841a616de3b3403e52e3789cb60c147ab52b3fe6c33b31fdffba0164ae031",
},
"linux": {
"amd64": "ff3680acc0e2295db453e8e241a0cab5ea44f84586f4c5c00860822380713397",
"arm64": "dece4264cef3f553636482c2ba15e04ac4e1597dafc092b27c6e3da3acc4ad73",
"amd64": "064fc0c07f4d71f7369b168c337caa88ef32a6b00b16449cea44790ccadfc2b4",
"arm64": "4720693b333826569d5c1ed746a735c4d1983719c95af5bdd4d9dfeaa755e933",
},
},
}
Expand Down
4 changes: 1 addition & 3 deletions src/v/test_utils/go/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module redpanda-test-utils

go 1.24.0

toolchain go1.24.3
go 1.25.7

require (
github.com/kr/pretty v0.3.1
Expand Down
Loading