This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch jbilleter/buildtree-shell in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit b52382a333c9099594a76cae6e99163b2b38e2b6 Author: Jürg Billeter <[email protected]> AuthorDate: Fri Nov 14 13:34:55 2025 +0100 artifact.proto: Add marked directories to the build sandbox state --- src/buildstream/_protos/buildstream/v2/artifact.proto | 1 + src/buildstream/_protos/buildstream/v2/artifact_pb2.py | 6 +++--- src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/buildstream/_protos/buildstream/v2/artifact.proto b/src/buildstream/_protos/buildstream/v2/artifact.proto index 1024ce860..28d006f0f 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact.proto +++ b/src/buildstream/_protos/buildstream/v2/artifact.proto @@ -90,6 +90,7 @@ message Artifact { repeated build.bazel.remote.execution.v2.Command.EnvironmentVariable environment = 1; string working_directory = 2; repeated build.bazel.remote.execution.v2.Digest subsandbox_digests = 3; + repeated string marked_directories = 4; }; SandboxState buildsandbox = 18; // optional } diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py index 7d86ea3b8..a81006af5 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py @@ -26,7 +26,7 @@ from buildstream._protos.build.bazel.remote.execution.v2 import remote_execution from buildstream._protos.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\x8a\t\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\ [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xa6\t\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\ [...] _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -34,11 +34,11 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'buildstream.v2.artifact_pb2 if not _descriptor._USE_C_DESCRIPTORS: DESCRIPTOR._loaded_options = None _globals['_ARTIFACT']._serialized_start=136 - _globals['_ARTIFACT']._serialized_end=1298 + _globals['_ARTIFACT']._serialized_end=1326 _globals['_ARTIFACT_DEPENDENCY']._serialized_start=921 _globals['_ARTIFACT_DEPENDENCY']._serialized_end=1020 _globals['_ARTIFACT_LOGFILE']._serialized_start=1022 _globals['_ARTIFACT_LOGFILE']._serialized_end=1102 _globals['_ARTIFACT_SANDBOXSTATE']._serialized_start=1105 - _globals['_ARTIFACT_SANDBOXSTATE']._serialized_end=1298 + _globals['_ARTIFACT_SANDBOXSTATE']._serialized_end=1326 # @@protoc_insertion_point(module_scope) diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi b/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi index 08c6960c1..7eb4d7550 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.pyi @@ -28,14 +28,16 @@ class Artifact(_message.Message): digest: _remote_execution_pb2.Digest def __init__(self, name: _Optional[str] = ..., digest: _Optional[_Union[_remote_execution_pb2.Digest, _Mapping]] = ...) -> None: ... class SandboxState(_message.Message): - __slots__ = ("environment", "working_directory", "subsandbox_digests") + __slots__ = ("environment", "working_directory", "subsandbox_digests", "marked_directories") ENVIRONMENT_FIELD_NUMBER: _ClassVar[int] WORKING_DIRECTORY_FIELD_NUMBER: _ClassVar[int] SUBSANDBOX_DIGESTS_FIELD_NUMBER: _ClassVar[int] + MARKED_DIRECTORIES_FIELD_NUMBER: _ClassVar[int] environment: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Command.EnvironmentVariable] working_directory: str subsandbox_digests: _containers.RepeatedCompositeFieldContainer[_remote_execution_pb2.Digest] - def __init__(self, environment: _Optional[_Iterable[_Union[_remote_execution_pb2.Command.EnvironmentVariable, _Mapping]]] = ..., working_directory: _Optional[str] = ..., subsandbox_digests: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ...) -> None: ... + marked_directories: _containers.RepeatedScalarFieldContainer[str] + def __init__(self, environment: _Optional[_Iterable[_Union[_remote_execution_pb2.Command.EnvironmentVariable, _Mapping]]] = ..., working_directory: _Optional[str] = ..., subsandbox_digests: _Optional[_Iterable[_Union[_remote_execution_pb2.Digest, _Mapping]]] = ..., marked_directories: _Optional[_Iterable[str]] = ...) -> None: ... VERSION_FIELD_NUMBER: _ClassVar[int] BUILD_SUCCESS_FIELD_NUMBER: _ClassVar[int] BUILD_ERROR_FIELD_NUMBER: _ClassVar[int]
