Patch rules_go to avoid failures with Go 1.25

github · mbg · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 23, 2025
commit 6a996b6c032dc9f5ecb1ec72f0f04586404a5ea6
@@ -15,7 +15,7 @@ local_path_override(
 # see https://registry.bazel.build/ for a list of available packages
 
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "rules_go", version = "0.50.1")
+bazel_dep(name = "rules_go", version = "0.55.1-codeql.1")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
 bazel_dep(name = "rules_python", version = "0.40.0")

@@ -0,0 +1,54 @@
+module(
+    name = "rules_go",
+    # Updated by the Publish to BCR app.
+    version = "0.55.1-codeql.1",
+    compatibility_level = 0,
+    repo_name = "io_bazel_rules_go",
+)
+
+# The custom repo_name is used to prevent our bazel_features polyfill for WORKSPACE builds from
+# conflicting with the real bazel_features repo.
+bazel_dep(name = "bazel_features", version = "1.9.1", repo_name = "io_bazel_rules_go_bazel_features")
+bazel_dep(name = "bazel_skylib", version = "1.2.0")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_proto", version = "7.0.2")
+bazel_dep(name = "protobuf", version = "29.0-rc2.bcr.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_shell", version = "0.3.0")
+
+go_sdk = use_extension("//go:extensions.bzl", "go_sdk")
+
+# Don't depend on this repo by name, use toolchains instead.
+# See https://github.com/bazel-contrib/rules_go/blob/master/go/toolchains.rst
+go_sdk.from_file(
+    name = "go_default_sdk",
+    go_mod = "//:go.mod",
+)
+use_repo(
+    go_sdk,
+    "go_host_compatible_sdk_label",
+    "go_toolchains",
+    # This name is ugly on purpose to avoid a conflict with a user-named SDK.
+    "io_bazel_rules_nogo",
+)
+
+register_toolchains("@go_toolchains//:all")
+
+bazel_dep(name = "gazelle", version = "0.36.0")
+
+go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
+go_deps.from_file(go_mod = "//:go.mod")
+use_repo(
+    go_deps,
+    "com_github_gogo_protobuf",
+    "com_github_golang_mock",
+    "com_github_golang_protobuf",
+    "com_github_pmezard_go_difflib",
+    "org_golang_google_genproto",
+    "org_golang_google_grpc",
+    "org_golang_google_grpc_cmd_protoc_gen_go_grpc",
+    "org_golang_google_protobuf",
+    "org_golang_x_net",
+    "org_golang_x_tools",
+    # Exported by gazelle specifically for rules_go.
+    "bazel_gazelle_go_repository_config",
+)
diff --git a/...istry/modules/rules_go/0.55.1-codeql.1/patches/codeql_do_not_use_nocoverageredesign.patch b/...istry/modules/rules_go/0.55.1-codeql.1/patches/codeql_do_not_use_nocoverageredesign.patch
@@ -0,0 +1,25 @@
+diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl
+index 156bb25..feb55eb 100644
+--- a/go/private/sdk.bzl
++++ b/go/private/sdk.bzl
+@@ -443,13 +443,13 @@ def _sdk_build_file(ctx, platform, version, experiments):
+     ctx.file("ROOT")
+     goos, _, goarch = platform.partition("_")
+
+-    pv = parse_version(version)
+-    if pv != None and pv[1] >= 20:
+-        # Turn off coverageredesign GOEXPERIMENT on 1.20+
+-        # until rules_go is updated to work with the
+-        # coverage redesign.
+-        if not "nocoverageredesign" in experiments and not "coverageredesign" in experiments:
+-            experiments = experiments + ["nocoverageredesign"]
++    # pv = parse_version(version)
++    # if pv != None and pv[1] >= 20:
++    #     # Turn off coverageredesign GOEXPERIMENT on 1.20+
++    #     # until rules_go is updated to work with the
++    #     # coverage redesign.
++    #     if not "nocoverageredesign" in experiments and not "coverageredesign" in experiments:
++    #         experiments = experiments + ["nocoverageredesign"]
+
+     ctx.template(
+         "BUILD.bazel",
diff --git a/misc/bazel/registry/modules/rules_go/0.55.1-codeql.1/source.json b/misc/bazel/registry/modules/rules_go/0.55.1-codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-nXL3uJBBKK+5jUa774KtciPsn/NxjUGa+zVf3dn5SEo=",
+    "strip_prefix": "",
+    "url": "https://github.com/bazel-contrib/rules_go/releases/download/v0.55.1/rules_go-v0.55.1.zip",
+    "patches": {
+        "codeql_do_not_use_nocoverageredesign.patch": "sha256-v/eo1XWUpNLWKVAUcR/MlIYqKAGTS+2eWopxTl8lEwk="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_go/metadata.json b/misc/bazel/registry/modules/rules_go/metadata.json
@@ -0,0 +1,30 @@
+{
+    "homepage": "https://github.com/bazelbuild/rules_go",
+    "maintainers": [
+        {
+            "email": "fabian@meumertzhe.im",
+            "github": "fmeum",
+            "name": "Fabian Meumertzheim",
+            "github_user_id": 4312191
+        },
+        {
+            "email": "zplin@uber.com",
+            "github": "linzhp",
+            "name": "Zhongpeng Lin",
+            "github_user_id": 98395
+        },
+        {
+            "email": "tfrench@uber.com",
+            "github": "tyler-french",
+            "name": "Tyler French",
+            "github_user_id": 66684063
+        }
+    ],
+    "repository": [
+        "github:bazel-contrib/rules_go"
+    ],
+    "versions": [
+        "0.55.1-codeql.1"
+    ],
+    "yanked_versions": {}
+}