Skip to content

Commit d112f85

Browse files
committed
Fix tests?
1 parent 6303495 commit d112f85

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.bazelci/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
tasks:
1515
debian11_bazel6:
1616
platform: debian11
17-
bazel: 6.5.0 # test minimum supported version of bazel
17+
bazel: 7.1.0 # test minimum supported version of bazel that works with our bzlmod setup
1818
build_targets:
1919
- "//..."
2020
- "-//tests/core/go_binary:goos_pure_bin"

MODULE.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ use_repo(
5959

6060
bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
6161

62-
go_sdk.download(
62+
dev_go_sdk = use_extension("//go:extensions.bzl", "go_sdk", dev_dependency = True)
63+
64+
dev_go_sdk.download(
6365
name = "rules_go_internal_compatibility_sdk",
6466
version = "1.22.12",
6567
)

go/private/extensions.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ def _go_sdk_impl(ctx):
275275
# over extra SDKs specified with `download`. That way the `from_file` toolchains are registered
276276
# with higher precedence and become default, while `download`'ed toolchains can still be
277277
# requested explicitly.
278+
# TODO(zbarsky/fmeum): This is still not the ideal ordering. We should respect the order that tags are
279+
# specified in, but Bzlmod currently doesn't provide this information across tag classes.
278280
for index, download_tag in enumerate(additional_download_tags + module.tags.download):
279281
# SDKs without an explicit version are fetched even when not selected by toolchain
280282
# resolution. This is acceptable if brought in by the root module, but transitive

go/tools/gopackagesdriver/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ go_bazel_test(
4141
srcs = ["gopackagesdriver_test.go"],
4242
embed = [":gopackagesdriver_lib"],
4343
env = {
44-
"GOPACKAGESDRIVER_BAZEL_COMMON_FLAGS": "--noexperimental_enable_bzlmod",
44+
"GOPACKAGESDRIVER_BAZEL_COMMON_FLAGS": "--experimental_enable_bzlmod",
4545
},
4646
rule_files = ["//:all_files"],
4747
x_defs = {

0 commit comments

Comments
 (0)