Skip to content

Commit 685eb0f

Browse files
Working around bazel-contrib/rules_oci#858. - Bump rules_oci to latest - Unset the feature flag - Tag the defaults as manual so they don't build ### Changes are visible to end-users: no ### Test plan This is the test plan. --------- Co-authored-by: aspect-marvin[bot] <[email protected]>
1 parent f2701d6 commit 685eb0f

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

.bcr/patches/remove_dev_deps.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/MODULE.bazel 2025-10-28 13:08:11
2-
+++ b/MODULE.bazel 2025-10-28 13:08:11
1+
--- a/MODULE.bazel 2025-10-28 13:13:30
2+
+++ b/MODULE.bazel 2025-10-28 13:13:30
33
@@ -22,557 +22,5 @@
44
"@aspect_rules_py//py/private/toolchain/venv/...",
55
"@aspect_rules_py//py/private/toolchain/unpack/...",
@@ -441,7 +441,7 @@
441441
-########################################
442442
-# from bazel/include/oci.MODULE.bazel
443443
-# rules_oci and friends
444-
-bazel_dep(name = "rules_oci", version = "2.0.1", dev_dependency = True)
444+
-bazel_dep(name = "rules_oci", version = "2.2.6", dev_dependency = True)
445445
-
446446
-oci = use_extension("@rules_oci//oci:extensions.bzl", "oci", dev_dependency = True)
447447
-oci.pull(

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ use_repo(version, "bazel_features_globals", "bazel_features_version")
459459
########################################
460460
# from bazel/include/oci.MODULE.bazel
461461
# rules_oci and friends
462-
bazel_dep(name = "rules_oci", version = "2.0.1", dev_dependency = True)
462+
bazel_dep(name = "rules_oci", version = "2.2.6", dev_dependency = True)
463463

464464
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci", dev_dependency = True)
465465
oci.pull(

bazel/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ bazelrc_preset(
1010
# USE_BAZEL_VERSION for testing.
1111
doc_link_template = "https://registry.build/flag/bazel?filter={flag}",
1212
strict = True,
13+
tags = [
14+
"manual",
15+
],
1316
target_compatible_with = incompatible_with("9.0.0"),
1417
)

bazel/defaults.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ common:debug --test_timeout=9999
209209
# Migration requires setting a toolchain parameter inside ctx.actions.{run, run_shell} for actions which use tool or executable from a toolchain.
210210
#
211211
# See https://github.com/bazelbuild/bazel/issues/17134
212-
common --incompatible_auto_exec_groups
212+
# common --incompatible_auto_exec_groups
213213
# Docs: https://registry.build/flag/bazel?filter=incompatible_auto_exec_groups
214214

215215
# Language specific rules (Protos, Java, C++, Android) are being rewritten to Starlark and moved from Bazel into their rules repositories

bazel/include/oci.MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# rules_oci and friends
2-
bazel_dep(name = "rules_oci", version = "2.0.1", dev_dependency = True)
2+
bazel_dep(name = "rules_oci", version = "2.2.6", dev_dependency = True)
33

44
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci", dev_dependency = True)
55
oci.pull(

bazel/rust/defs.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def rust_library(name, rustc_env_files = [], version_key = "", crate_features =
112112
"//conditions:default": [
113113
"-Ccodegen-units=1",
114114
"-Copt-level=3",
115+
"-Cstrip=symbols",
115116
],
116117
}),
117118
crate_features = crate_features + ["bazel"],
@@ -135,11 +136,12 @@ def rust_proc_macro(name, crate_features = [], **kwargs):
135136
"-Ccodegen-units=1",
136137
"-Copt-level=3",
137138
"-Cpanic=abort",
138-
"-Cstrip=symbols",
139+
"--release",
139140
],
140141
"//conditions:default": [
141142
"-Ccodegen-units=1",
142143
"-Copt-level=3",
144+
"-Cstrip=debuginfo",
143145
],
144146
}),
145147
crate_features = crate_features + ["bazel"],

0 commit comments

Comments
 (0)