From 21298237e2118632d8d38066a8c86ed7f31dbc53 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Dec 2021 08:28:49 -0600 Subject: [PATCH 1/3] Update ulab This fixes a doc-building bug and also a bug with any()/all(). --- extmod/ulab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/ulab b/extmod/ulab index c03990cc56..a99e0b9878 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit c03990cc56283417e752246c2738199f65d1b7ef +Subproject commit a99e0b98787266369eaa33bdae271de761eca05b From da4f5bdaefae2b1eeaa721244853b4661013277c Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Dec 2021 09:32:53 -0600 Subject: [PATCH 2/3] fix ci matrix when ulab is modified When the submodule is modified, the modified 'filename' is simply the submodule path `extmod/ulab`, not the specific file(s) in the submodule that are modified. --- tools/ci_set_matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py index b25d81ac95..e8a7c95656 100644 --- a/tools/ci_set_matrix.py +++ b/tools/ci_set_matrix.py @@ -120,7 +120,7 @@ def set_docs_to_build(build_all): doc_match = build_all if not build_all: doc_pattern = re.compile( - r"^(?:docs|(?:(?:extmod\/ulab|ports\/\w+\/bindings|shared-bindings)\S+\.c|conf\.py|tools\/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$" + r"^(?:docs|extmod/ulab|(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|conf\.py|tools\/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$" ) for p in changed_files: if doc_pattern.search(p): From bd282bb1be33f2ec16811db38e9d7bc71894995b Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Dec 2021 09:34:47 -0600 Subject: [PATCH 3/3] do not backslash-escape forward slashes --- tools/ci_set_matrix.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py index e8a7c95656..efb4427e7e 100644 --- a/tools/ci_set_matrix.py +++ b/tools/ci_set_matrix.py @@ -68,8 +68,8 @@ def set_boards_to_build(build_all): if not build_all: boards_to_build = set() - board_pattern = re.compile(r"^ports\/[^/]+\/boards\/([^/]+)\/") - port_pattern = re.compile(r"^ports\/([^/]+)\/") + board_pattern = re.compile(r"^ports/[^/]+/boards/([^/]+)/") + port_pattern = re.compile(r"^ports/([^/]+)/") for p in changed_files: # See if it is board specific board_matches = board_pattern.search(p) @@ -120,7 +120,7 @@ def set_docs_to_build(build_all): doc_match = build_all if not build_all: doc_pattern = re.compile( - r"^(?:docs|extmod/ulab|(?:(?:ports\/\w+\/bindings|shared-bindings)\S+\.c|conf\.py|tools\/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$" + r"^(?:docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$" ) for p in changed_files: if doc_pattern.search(p):