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 e39af277cb009c0fc2e255f453c234258a2fe2a4 Merge: 16e45332b 9f0c6dace Author: Jürg Billeter <[email protected]> AuthorDate: Thu Apr 30 11:39:28 2026 +0200 Merge pull request #2114 from apache/jbilleter/loader Fix circular reference errors with junction overrides src/buildstream/_loader/loader.py | 17 ++---- tests/format/junctions.py | 64 ++++++++++++++++++++++ .../alternative-placeholder.bst | 1 + .../intermediate-project.bst | 12 ++++ .../intermediate-project/project.conf | 15 +++++ .../intermediate-project/subproject.bst | 9 +++ .../intermediate-project/subproject/include.yml | 8 +++ .../subproject/placeholder.bst | 1 + .../intermediate-project/subproject/project.conf | 12 ++++ .../intermediate-project/subproject/target.bst | 4 ++ .../junctions/include-complex-nested/project.conf | 15 +++++ .../include-complex-nested/subproject.bst | 4 ++ .../junctions/include-complex-nested/target.bst | 4 ++ tests/format/junctions/override-self-link/link.bst | 4 ++ .../junctions/override-self-link/nested-link.bst | 4 ++ .../junctions/override-self-link/project.conf | 6 ++ .../junctions/override-self-link/subproject.bst | 4 ++ .../override-self-link/subproject/alternative.bst | 4 ++ .../override-self-link/subproject/include.yml | 0 .../override-self-link/subproject/project.conf | 6 ++ .../subproject/self-junction.bst | 9 +++ .../override-self-link/subproject/target.bst | 4 ++ 22 files changed, 196 insertions(+), 11 deletions(-)
