[buildstream] branch tristan/fix-potential-race updated (0a18acaf9 -> c2fb36d38)

[tv...@apache.org]

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

tvb pushed a change to branch tristan/fix-potential-race
in repository https://gitbox.apache.org/repos/asf/buildstream.git


 discard 0a18acaf9 element.py: Lower expectations when discarding failed builds in non-strict mode
     add bb42fa014 _project.py: Allow option conditional resolution at project toplevel.
     add 2a6045fd1 tests/format/optionprojectroot.py: Test project root conditional resolution
     add 4882e45d3 tests/format/optionprojectroot.py: Test option resolution in element overrides
     add 2c96e5505 _options/optionpool.py: Allow restriction of composition of specified keys
     add 954e00fee _project.py: Specify a set of root keys which cannot be conditionally specified
     add 57403e656 tests/format/optionprojectroot.py: Test some restricted keys in the project.conf
     add b4179bfd7 Merge pull request #1695 from apache/tristan/resolve-conditionals-project-root
     add 842c5912b _pluginfactory/pluginoriginjunction.py: Don't force load projects
     add e5111ff45 tests/plugin/loading.py: Regression test for complex cross junction scenario
     add ea82b2131 Merge pull request #1696 from apache/tristan/fix-cross-junction-plugins
     add c2fb36d38 element.py: Lower expectations when discarding failed builds in non-strict mode

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0a18acaf9)
            \
             N -- N -- N   refs/heads/tristan/fix-potential-race (c2fb36d38)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/buildstream/_options/optionpool.py             | 20 +++++-
 .../_pluginfactory/pluginoriginjunction.py         |  1 -
 src/buildstream/_project.py                        | 20 +++++-
 .../option-element-override}/element.bst           |  0
 tests/format/option-element-override/project.conf  | 24 +++++++
 .../option-project-root}/element.bst               |  0
 .../project.conf                                   | 11 +++-
 .../option-restricted-name}/element.bst            |  0
 .../project.conf                                   |  9 ++-
 .../option-restricted-options}/element.bst         |  0
 .../format/option-restricted-options/project.conf  | 25 ++++++++
 tests/format/optionprojectroot.py                  | 68 ++++++++++++++++++++
 .../junction-with-junction}/element.bst            |  0
 tests/plugins/junction-with-junction/project.conf  | 11 ++++
 .../junction-with-junction/subproject/project.conf |  2 +
 .../subproject/variables.yml}                      |  2 +-
 tests/plugins/loading.py                           | 73 ++++++++++++++++++++++
 tests/plugins/sample-plugins/project.conf          | 15 +++++
 18 files changed, 273 insertions(+), 8 deletions(-)
 copy tests/{artifactcache/missing-certs => format/option-element-override}/element.bst (100%)
 create mode 100644 tests/format/option-element-override/project.conf
 copy tests/{artifactcache/missing-certs => format/option-project-root}/element.bst (100%)
 copy tests/format/{junctions/options/options-base => option-project-root}/project.conf (50%)
 copy tests/{artifactcache/missing-certs => format/option-restricted-name}/element.bst (100%)
 copy tests/format/{junctions/options/options-base => option-restricted-name}/project.conf (57%)
 copy tests/{artifactcache/missing-certs => format/option-restricted-options}/element.bst (100%)
 create mode 100644 tests/format/option-restricted-options/project.conf
 create mode 100644 tests/format/optionprojectroot.py
 copy tests/{artifactcache/missing-certs => plugins/junction-with-junction}/element.bst (100%)
 create mode 100644 tests/plugins/junction-with-junction/project.conf
 create mode 100644 tests/plugins/junction-with-junction/subproject/project.conf
 copy tests/{format/junctions/override-self/target.bst => plugins/junction-with-junction/subproject/variables.yml} (69%)
 create mode 100644 tests/plugins/sample-plugins/project.conf