Skip to content

Commit d162bbb

Browse files
authored
Merge pull request #5715 from dhalbert/adabot-for-website
Fix website action dependencies; don't build everything on CI changes - 7.1.x backport
2 parents edabf67 + dcc61d3 commit d162bbb

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

tools/ci_fetch_deps.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ def run(title, command):
7373
# This builds one board from a number of ports so fill out a bunch of submodules
7474
submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"]
7575
elif target == "website":
76-
# No submodules needed.
77-
pass
76+
submodules = ["tools/adabot/"]
7877
else:
7978
p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk"))
8079
if not p:

tools/ci_set_matrix.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
"stm": "arm",
3535
}
3636

37+
IGNORE = [
38+
"tools/ci_set_matrix.py",
39+
"tools/ci_check_duplicate_usb_vid_pid.py",
40+
]
41+
3742
changed_files = {}
3843
try:
3944
changed_files = json.loads(os.environ["CHANGED_FILES"])
@@ -81,6 +86,14 @@ def set_boards_to_build(build_all):
8186
boards_to_build.update(port_to_boards[port])
8287
continue
8388

89+
# Check the ignore list to see if the file isn't used on board builds.
90+
if p in IGNORE:
91+
continue
92+
93+
# Boards don't run tests so ignore those as well.
94+
if p.startswith("tests"):
95+
continue
96+
8497
# Otherwise build it all
8598
boards_to_build = all_board_ids
8699
break

0 commit comments

Comments
 (0)