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:50 UTC

[buildstream] branch master updated (58da3622c -> 8036e2f8a)

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

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


    from 58da3622c Merge pull request #1699 from apache/tristan/fix-potential-race
     add cb46d426d _project.py: Remove deadcode Project initializer `load_project`
     add cff58ec84 _loader/loader.py: Fix a couple of issues with loading cross junction elements
     add b4699f24d tests/format/junctions.py: Test complex cross junction include scenario
     add 2731e48ea tests/plugins/loading.py: Check loading of subproject elements via command line
     new 8036e2f8a Merge pull request #1701 from apache/tristan/fix-load-cross-project-element

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/buildstream/_loader/loader.py                  | 12 +++++--
 src/buildstream/_project.py                        |  4 +--
 tests/format/junctions.py                          | 40 ++++++++++++++++++++++
 .../options-base => include-complex}/project.conf  |  9 +++--
 .../subproject.bst                                 |  4 +--
 .../include-complex/subproject/include.yml         |  8 +++++
 .../subproject}/project.conf                       |  7 ++--
 .../include-complex/subproject/target.bst          |  4 +++
 .../{simple => include-complex}/target.bst         |  2 +-
 .../junction-with-junction/subproject/target.bst   |  0
 tests/plugins/loading.py                           |  6 ++++
 11 files changed, 83 insertions(+), 13 deletions(-)
 copy tests/format/junctions/{options/options-base => include-complex}/project.conf (52%)
 copy tests/format/junctions/{duplicates-override-dup => include-complex}/subproject.bst (56%)
 create mode 100644 tests/format/junctions/include-complex/subproject/include.yml
 copy tests/format/junctions/{options/options-base => include-complex/subproject}/project.conf (58%)
 create mode 100644 tests/format/junctions/include-complex/subproject/target.bst
 copy tests/format/junctions/{simple => include-complex}/target.bst (74%)
 copy src/buildstream/_testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst => tests/plugins/junction-with-junction/subproject/target.bst (100%)

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

Posted by tv...@apache.org.
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(-)