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/19 06:14:24 UTC

[buildstream] 01/01: Merge pull request #1688 from apache/tristan/validate-cross-project-include-vars

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 0ee79a528ddf51677bd4fee08ed044e6a1451544
Merge: 91130cc61 d63598686
Author: Tristan Van Berkom <tr...@codethink.co.uk>
AuthorDate: Tue Jul 19 15:14:17 2022 +0900

    Merge pull request #1688 from apache/tristan/validate-cross-project-include-vars
    
    Resolve variables in included files in the appropriate project context

 src/buildstream/_includes.py                       | 10 ++++++
 tests/format/junctions.py                          | 40 ++++++++++++++++++++++
 .../junctions/include-vars-optional/project.conf   | 11 ++++++
 .../junctions/include-vars-optional/subproject.bst | 13 +++++++
 .../include-vars-optional/subproject/include.yml   | 12 +++++++
 .../include-vars-optional/subproject/project.conf  | 14 ++++++++
 .../junctions/include-vars-optional/target.bst     |  3 ++
 tests/format/junctions/include-vars/project.conf   |  5 +++
 tests/format/junctions/include-vars/subproject.bst |  4 +++
 .../junctions/include-vars/subproject/include.yml  |  3 ++
 .../junctions/include-vars/subproject/project.conf |  5 +++
 tests/format/junctions/include-vars/target.bst     |  3 ++
 12 files changed, 123 insertions(+)