You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/07/26 05:28:51 UTC

[buildstream] 01/01: Merge pull request #1701 from apache/tristan/fix-load-cross-project-element

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 8036e2f8a0dcb1ee6b95406e7b804bc07b9abaaf
Merge: 58da3622c 2731e48ea
Author: Tristan Van Berkom <tr...@codethink.co.uk>
AuthorDate: Tue Jul 26 14:28:46 2022 +0900

    Merge pull request #1701 from apache/tristan/fix-load-cross-project-element
    
    Fix loading cross project element

 src/buildstream/_loader/loader.py                  | 12 +++++--
 src/buildstream/_project.py                        |  4 +--
 tests/format/junctions.py                          | 40 ++++++++++++++++++++++
 .../format/junctions/include-complex/project.conf  | 15 ++++++++
 .../junctions/include-complex/subproject.bst       |  8 +++++
 .../include-complex/subproject/include.yml         |  8 +++++
 .../include-complex/subproject/project.conf        | 11 ++++++
 .../include-complex/subproject/target.bst          |  4 +++
 tests/format/junctions/include-complex/target.bst  |  4 +++
 .../junction-with-junction/subproject/target.bst   |  1 +
 tests/plugins/loading.py                           |  6 ++++
 11 files changed, 108 insertions(+), 5 deletions(-)