This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 0e7f8e462a7366ef6bf16e85d49189a47cf3c845 Merge: 65e2074ad 1f826f49f Author: Jürg Billeter <[email protected]> AuthorDate: Sat Nov 23 11:04:28 2024 +0100 Merge pull request #1969 from apache/juerg/nested-junctions Ensure that the parent project is fully loaded first src/buildstream/_includes.py | 5 +++++ src/buildstream/_project.py | 14 ++++++++++---- tests/format/junctions.py | 19 +++++++++++++++++++ tests/format/junctions/nested-include/project.conf | 4 ++++ tests/format/junctions/nested-include/subproject.bst | 4 ++++ .../junctions/nested-include/subproject/project.conf | 4 ++++ .../junctions/nested-include/subproject/sub.txt | 1 + .../nested-include/subproject/subsubproject.bst | 4 ++++ .../subproject/subsubproject/include.yml | 0 .../subproject/subsubproject/project.conf | 2 ++ .../subproject/subsubproject/subsub.txt | 1 + .../subproject/subsubproject/target.bst | 4 ++++ .../junctions/nested-include/subproject/subtarget.bst | 4 ++++ .../junctions/nested-include/subproject/target.bst | 4 ++++ tests/format/junctions/nested-include/target.bst | 5 +++++ 15 files changed, 71 insertions(+), 4 deletions(-)
