Skip to content

Avoid depending on coreutils in bazel shell actions (NixOS compatibility) #29510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicdumz wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −6
Open

Avoid depending on coreutils in bazel shell actions (NixOS compatibility) #29510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1395b27
fix(protoc_authenticity): avoid depending on coreutils grep/cat in sh…
nicdumz Aug 29, 2026
ec2c07b
fix(bootstrap_compiler): avoid depending on coreutils dirname in boot…
nicdumz Aug 29, 2026
a7beb0a
Fix formatting of echo statement for actual version
nicdumz Aug 29, 2026
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
8 changes: 4 additions & 4 deletions bazel/private/oss/toolchains/prebuilt/protoc_authenticity.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ def _protoc_authenticity_impl(ctx):
toolchain = toolchains.PROTO_TOOLCHAIN,
command = """\
{protoc} --version > {validation_output}
grep -q -e "-dev$" {validation_output} && {{
IFS= read -r version_line < {validation_output}
[[ $version_line == *-dev ]] && {{
echo 'WARNING: Detected a development version of protoc.
Development versions are not validated for authenticity.
To ensure a secure build, please use a released version of protoc.'
exit 0
}}
grep -q "^libprotoc {RELEASE_VERSION}" {validation_output} || {{
[[ $version_line == "libprotoc {RELEASE_VERSION}"* ]] || {{
echo '{severity}: protoc version does not match protobuf Bazel module; we do not support this.
It is considered undefined behavior that is expected to break in the future even if it appears to work today.'
echo '{suppression_note}'
echo 'Expected: libprotoc {RELEASE_VERSION}'
echo -n 'Actual: '
cat {validation_output}
echo "Actual: $version_line"
exit {mismatch_exit_code}
}} >&2
""".format(
Expand Down
9 changes: 7 additions & 2 deletions upb_generator/bootstrap_compiler.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ def _c_library_with_default_copts(**kwargs):
_stages = ["_stage0", "_stage1", ""]
_protoc = "//src/google/protobuf/compiler/release:protoc_minimal"

_extra_proto_path = "-I$$(dirname $(location //:descriptor_proto_srcs))/../.. "
# Uses bash parameter expansion (${var%/*}) instead of the external `dirname`
# binary, which may not be resolvable in a sandboxed action with no PATH.
_extra_proto_path_setup = "descriptor_proto_dir=$(location //:descriptor_proto_srcs); "
_extra_proto_path = "-I$${descriptor_proto_dir%/*}/../.. "

# This visibility is used automatically for anything used by the bootstrapping process.
_bootstrap_visibility = [
Expand Down Expand Up @@ -121,6 +124,7 @@ def _stage0_proto_staleness_test(name, src_files, src_rules, strip_prefix, third
outs = ["bootstrap_generated_sources/" + f.replace("third_party", third_party_dir) for f in _generated_hdrs_and_srcs(src_files, "stage0", "upb")],
tools = [_protoc, _upbc("upb", 0)],
cmd =
_extra_proto_path_setup +
"$(location " + _protoc + ") " +
"-I. -I$(GENDIR)/" + strip_prefix + " " + _extra_proto_path +
"--plugin=protoc-gen-upb=$(location " + _upbc("upb", 0) + ") " +
Expand Down Expand Up @@ -150,7 +154,8 @@ def _generate_stage1_proto(name, src_files, src_rules, generator, kwargs):
name = "gen_{}_{}_stage1".format(name, generator),
srcs = src_rules,
outs = _generated_hdrs_and_srcs(src_files, "stage1", generator),
cmd = "$(location " + _protoc + ") " +
cmd = _extra_proto_path_setup +
"$(location " + _protoc + ") " +
"--plugin=protoc-gen-" + generator +
"=$(location " + _upbc(generator, 0) + ") " + _extra_proto_path +
"--" + generator + "_out=bootstrap_stage=1:$(RULEDIR)/stage1 " +
Expand Down
Loading