Merge pull request #5715 from dhalbert/adabot-for-website

Fix website action dependencies; don't build everything on CI changes - 7.1.x backport
This commit is contained in:
Scott Shawcroft 2021-12-13 14:56:55 -08:00 committed by GitHub
commit d162bbbe84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions

View File

@ -73,8 +73,7 @@ elif target == "windows":
# This builds one board from a number of ports so fill out a bunch of submodules # This builds one board from a number of ports so fill out a bunch of submodules
submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"] submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"]
elif target == "website": elif target == "website":
# No submodules needed. submodules = ["tools/adabot/"]
pass
else: else:
p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk")) p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk"))
if not p: if not p:

View File

@ -34,6 +34,11 @@ PORT_TO_ARCH = {
"stm": "arm", "stm": "arm",
} }
IGNORE = [
"tools/ci_set_matrix.py",
"tools/ci_check_duplicate_usb_vid_pid.py",
]
changed_files = {} changed_files = {}
try: try:
changed_files = json.loads(os.environ["CHANGED_FILES"]) changed_files = json.loads(os.environ["CHANGED_FILES"])
@ -81,6 +86,14 @@ def set_boards_to_build(build_all):
boards_to_build.update(port_to_boards[port]) boards_to_build.update(port_to_boards[port])
continue continue
# Check the ignore list to see if the file isn't used on board builds.
if p in IGNORE:
continue
# Boards don't run tests so ignore those as well.
if p.startswith("tests"):
continue
# Otherwise build it all # Otherwise build it all
boards_to_build = all_board_ids boards_to_build = all_board_ids
break break