Skip to content

Commit 2c164bf

Browse files
authored
Guard reproducible usage behind bazel_features check (#12)
This is needed for Bazel 6 compatibility with Bzlmod enabled.
1 parent 03927e4 commit 2c164bf

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

.bazelci/presubmit.yml

+9-25
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,43 @@ matrix:
66
- ubuntu2004
77
- macos
88
- windows
9+
bazel:
10+
- 6.5.0
11+
- 7.3.2
912

1013
tasks:
1114
test_module_bzlmod:
12-
name: "Test module (Bazel 7.3.2, Bzlmod)"
15+
name: "Test module (Bzlmod)"
1316
working_directory: "tests/bcr"
14-
bazel: 7.3.2
17+
bazel: ${{ bazel }}
1518
platform: ${{ platform }}
1619
build_flags:
1720
- "--enable_bzlmod"
18-
- "--noenable_workspace"
1921
build_targets:
2022
- "//..."
2123
test_flags:
2224
- "--enable_bzlmod"
23-
- "--noenable_workspace"
2425
test_targets:
2526
- "//..."
2627
test_module_workspace:
27-
name: "Test module (Bazel 7.3.2, WORKSPACE)"
28+
name: "Test module (WORKSPACE)"
2829
working_directory: "tests/bcr"
29-
bazel: 7.3.2
30+
bazel: ${{ bazel }}
3031
platform: ${{ platform }}
3132
build_flags:
32-
- "--noenable_bzlmod"
33-
- "--enable_workspace"
33+
- "--enable_bzlmod"
3434
build_targets:
3535
- "//..."
3636
test_flags:
37-
- "--noenable_bzlmod"
38-
- "--enable_workspace"
39-
test_targets:
40-
- "//..."
41-
test_module_workspace_bazel6:
42-
name: "Test module (Bazel 6.5.0, WORKSPACE)"
43-
working_directory: "tests/bcr"
44-
bazel: 6.5.0
45-
platform: ${{ platform }}
46-
build_targets:
47-
- "//..."
37+
- "--enable_bzlmod"
4838
test_targets:
4939
- "//..."
5040
test_module_head:
5141
name: "Test module (Bazel@HEAD, Bzlmod)"
5242
working_directory: "tests/bcr"
5343
bazel: last_green
5444
platform: ${{ platform }}
55-
build_flags:
56-
- "--enable_bzlmod"
57-
- "--noenable_workspace"
5845
build_targets:
5946
- "//..."
60-
test_flags:
61-
- "--enable_bzlmod"
62-
- "--noenable_workspace"
6347
test_targets:
6448
- "//..."

MODULE.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ module(
33
version = "0.0.0",
44
)
55

6-
bazel_dep(name = "platforms", version = "0.0.10")
6+
bazel_dep(name = "bazel_features", version = "1.18.0")
77
bazel_dep(name = "bazel_skylib", version = "1.6.1")
8+
bazel_dep(name = "platforms", version = "0.0.10")
89

910
sh_configure = use_extension("//shell/private/extensions:sh_configure.bzl", "sh_configure")
1011
use_repo(sh_configure, "local_config_shell")

shell/private/extensions/sh_configure.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414

1515
"""The sh_configure module extension."""
1616

17+
load("@bazel_features//:features.bzl", "bazel_features")
1718
load("//shell/private/repositories:sh_config.bzl", "sh_config")
1819

1920
def _sh_configure_impl(module_ctx):
2021
sh_config(name = "local_config_shell")
21-
return module_ctx.extension_metadata(reproducible = True)
22+
if bazel_features.external_deps.extension_metadata_has_reproducible:
23+
return module_ctx.extension_metadata(reproducible = True)
24+
return None
2225

2326
sh_configure = module_extension(implementation = _sh_configure_impl)

0 commit comments

Comments
 (0)