Skip to content

Fix website action dependencies; don't build everything on CI changes - 7.1.x backport #5715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Fix website action dependencies; don't build everything on CI changes - 7.1.x backport #5715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f0c072
Fetch tools/adabot submodule for website build
tannewt Dec 10, 2021
d14868d
Exclude ci checks and tests from building boards
tannewt Dec 10, 2021
dcc61d3
remove whitespace
dhalbert Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tools/ci_fetch_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ def run(title, command):
# This builds one board from a number of ports so fill out a bunch of submodules
submodules = ["extmod/", "lib/", "tools/", "ports/", "data/nvm.toml/"]
elif target == "website":
# No submodules needed.
pass
submodules = ["tools/adabot/"]
else:
p = list(pathlib.Path(".").glob(f"ports/*/boards/{target}/mpconfigboard.mk"))
if not p:
Expand Down
13 changes: 13 additions & 0 deletions tools/ci_set_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
"stm": "arm",
}

IGNORE = [
"tools/ci_set_matrix.py",
"tools/ci_check_duplicate_usb_vid_pid.py",
]

changed_files = {}
try:
changed_files = json.loads(os.environ["CHANGED_FILES"])
Expand Down Expand Up @@ -81,6 +86,14 @@ def set_boards_to_build(build_all):
boards_to_build.update(port_to_boards[port])
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
boards_to_build = all_board_ids
break
Expand Down