[Notes] [Git][BuildStream/buildstream][valentindavid/absolute-whitelist]

Jürg Billeter pushed to branch valentindavid/absolute-whitelist at BuildStream / buildstream

Commits:

c8cd24b9

by Jonathan Maw at 2019-02-18T17:37:00Z

.gitlab-ci: make wsl-test automatic, allow failure

de70f8c0

by Jonathan Maw at 2019-02-18T18:57:45Z

Merge branch 'jonathan/wsl-tests-allow-fail' into 'master'

Allow WSL tests to run, but they don't block the CI

See merge request BuildStream/buildstream!1159

00b86b19

by Chandan Singh at 2019-02-18T18:59:31Z

doc/badges.py: Fix catching of CalledProcessError

Since `CalledProcessError` is defined by the `subprocess` module, it
must be caught as `subprocess.CalledProcessError`, and not as simply
`CalledProcessError`.

067a0c6b

by Chandan Singh at 2019-02-18T20:31:10Z

Merge branch 'chandan/fix-badge-subprocess-error' into 'master'

doc/badges.py: Fix catching of CalledProcessError

See merge request BuildStream/buildstream!1160

fca37d0d

by Chandan Singh at 2019-02-19T06:37:04Z

buildstream/_yaml.py: Import Mapping from collections.abc

Instead of importing `Mapping` from `collections`, it must be imported
from `collections.abc`, as the old method will stop working from Python
3.8.

5f0571d1

by Jürg Billeter at 2019-02-19T07:37:21Z

Merge branch 'chandan/fix-mapping-import' into 'master'

buildstream/_yaml.py: Import Mapping from collections.abc

See merge request BuildStream/buildstream!1161

e2074693

by Gökçen Nurlu at 2019-02-19T07:44:54Z

Prevent caching when Element.stage() fails

That step is not actually part of the build phase should not be cached and
causes hard to find bugs.

Fixes #791

cfbe409d

by Jürg Billeter at 2019-02-19T09:00:31Z

Merge branch 'gokcennurlu/dont_cache_if_stage_fails' into 'master'

Prevent caching when Element.stage() fails

Closes #791

See merge request BuildStream/buildstream!1012

1ae17968

by Valentin David at 2019-02-19T09:01:48Z

element.py: Expect absolute paths in overlap whitelists

This allows use of variables such as %{prefix} and matches the
documentation. This is a breaking change.

Fixes #721

8 changed files:

.gitlab-ci.yml
NEWS
buildstream/_yaml.py
buildstream/element.py
doc/badges.py
tests/frontend/overlaps/a-whitelisted.bst
tests/frontend/overlaps/b-whitelisted.bst
tests/frontend/overlaps/c-whitelisted.bst

Changes:

.gitlab-ci.yml

@@ -160,7 +160,7 @@ tests-wsl:
    script:
    - "${TEST_COMMAND}"
 -  when: manual
 +  allow_failure: true
  # Automatically build documentation for every commit, we want to know
  # if building documentation fails even if we're not deploying it.

NEWS

@@ -138,6 +138,9 @@ buildstream 1.3.1
    o BREAKING CHANGE: Symlinks are no longer resolved during staging and absolute
      symlinks are now preserved instead of being converted to relative symlinks.
 +  o BREAKING CHANGE: Overlap whitelists now require absolute paths. This allows
 +    use of variables such as %{prefix} and matches the documentation.
++
  =================
  buildstream 1.1.5

buildstream/_yaml.py

@@ -940,7 +940,7 @@ def node_sanitize(node):
          return [node_sanitize(elt) for elt in node]
      # Finally ChainMap and dict, and other Mappings need special handling
 -    if node_type in (dict, ChainMap) or isinstance(node, collections.Mapping):
 +    if node_type in (dict, ChainMap) or isinstance(node, collections.abc.Mapping):
          result = SanitizedDict()
          key_list = [key for key, _ in node_items(node)]

buildstream/element.py

@@ -1620,12 +1620,12 @@ class Element(Plugin):
                  self.__dynamic_public = _yaml.node_copy(self.__public)
                  # Call the abstract plugin methods
 -                try:
 -                    # Step 1 - Configure
 -                    self.__configure_sandbox(sandbox)
 -                    # Step 2 - Stage
 -                    self.stage(sandbox)
 +                # Step 1 - Configure
 +                self.__configure_sandbox(sandbox)
 +                # Step 2 - Stage
 +                self.stage(sandbox)
 +                try:
                      if self.__batch_prepare_assemble:
                          cm = sandbox.batch(self.__batch_prepare_assemble_flags,
                                             collect=self.__batch_prepare_assemble_collect)
@@ -2609,7 +2609,7 @@ class Element(Plugin):
              if include_file and not exclude_file:
                  yield filename.lstrip(os.sep)
 -    def __file_is_whitelisted(self, pattern):
 +    def __file_is_whitelisted(self, path):
          # Considered storing the whitelist regex for re-use, but public data
          # can be altered mid-build.
          # Public data is not guaranteed to stay the same for the duration of
@@ -2621,7 +2621,7 @@ class Element(Plugin):
              whitelist_expressions = [utils._glob2re(self.__variables.subst(exp.strip())) for exp in whitelist]
              _expression_ = ('^(?:' + '|'.join(whitelist_expressions) + ')$')
              self.__whitelist_regex = re.compile(_expression_)
 -        return self.__whitelist_regex.match(pattern)
 +        return self.__whitelist_regex.match(os.path.join(os.sep, path))
      # __extract():
+     #

doc/badges.py

@@ -96,7 +96,7 @@ def parse_tag(tag):
  def guess_version(release):
      try:
          tags_output = subprocess.check_output(['git', 'tag'])
 -    except CalledProcessError:
 +    except subprocess.CalledProcessError:
          return (0, 0, 0)
      # Parse the `git tag` output into a list of integer tuples

tests/frontend/overlaps/a-whitelisted.bst

@@ -10,4 +10,4 @@ sources:
  public:
    bst:
      overlap-whitelist:
 -    - "file*"
 +    - "/file*"

tests/frontend/overlaps/b-whitelisted.bst

@@ -8,9 +8,9 @@ sources:
  - kind: local
    path: "b"
  variables:
 -  FILE: file
 +  FILE: /file
  public:
    bst:
      overlap-whitelist:
 -    - file2
 +    - /file2
      - "%{FILE}3"

tests/frontend/overlaps/c-whitelisted.bst

@@ -8,4 +8,4 @@ sources:
  public:
    bst:
      overlap-whitelist:
 -    - "file*"
 +    - "/file*"

[Notes] [Git][BuildStream/buildstream][valentindavid/absolute-whitelist] 9 commits: .gitlab-ci: make wsl-test automatic, allow failure

Jürg Billeter pushed to branch valentindavid/absolute-whitelist at BuildStream / buildstream

Commits:

8 changed files:

Changes: