Skip to content

Commit 03bb7ff

Browse files
committed
refactor boards / build to ports / board
1 parent b17364a commit 03bb7ff

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-22.04
2222
outputs:
2323
docs: ${{ steps.set-matrix.outputs.docs }}
24-
boards: ${{ steps.set-matrix.outputs.boards }}
24+
ports: ${{ steps.set-matrix.outputs.ports }}
2525
windows: ${{ steps.set-matrix.outputs.windows }}
2626
cp-version: ${{ steps.set-up-submodules.outputs.version }}
2727
steps:
@@ -94,7 +94,7 @@ jobs:
9494

9595
mpy-cross:
9696
needs: scheduler
97-
if: needs.scheduler.outputs.boards != '{}'
97+
if: needs.scheduler.outputs.ports != '{}'
9898
uses: ./.github/workflows/re-build-mpy-cross.yml
9999
secrets: inherit
100100
with:
@@ -103,7 +103,7 @@ jobs:
103103
mpy-cross-mac:
104104
runs-on: macos-11
105105
needs: scheduler
106-
if: needs.scheduler.outputs.boards != '{}'
106+
if: needs.scheduler.outputs.ports != '{}'
107107
env:
108108
CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
109109
steps:
@@ -281,15 +281,15 @@ jobs:
281281
# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
282282
# https://github.com/espressif/esp-idf/issues/7062
283283

284-
boards:
284+
ports:
285285
needs: [scheduler, mpy-cross, tests]
286-
if: needs.scheduler.outputs.boards != '{}'
286+
if: needs.scheduler.outputs.ports != '{}'
287287
uses: ./.github/workflows/re-build-boards.yml
288288
secrets: inherit
289289
strategy:
290290
fail-fast: false
291291
matrix:
292-
port: ${{ fromJSON(needs.scheduler.outputs.boards).ports }}
292+
port: ${{ fromJSON(needs.scheduler.outputs.ports).ports }}
293293
with:
294-
boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.boards)[matrix.port]) }}
294+
boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.ports)[matrix.port]) }}
295295
cp-version: ${{ needs.scheduler.outputs.cp-version }}

.github/workflows/re-build-boards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
required: false
1717

1818
jobs:
19-
build:
19+
board:
2020
runs-on: ubuntu-22.04
2121
env:
2222
CP_VERSION: ${{ inputs.cp-version }}

tools/ci_changes_per_commit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def get_bad_check_runs(query_check_runs):
184184

185185
for check_run in check_runs[run_type]["nodes"]:
186186
name = check_run["name"]
187-
if name.startswith("boards") or regex_matrix.search(name):
187+
if name.startswith("ports") or regex_matrix.search(name):
188188
matrix = name.split(" ", 1)[0]
189189
matrix_job = name.rsplit(" (", 1)[1][:-1]
190190
bad_runs.setdefault(matrix, []).append(matrix_job)

tools/ci_set_matrix.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@ def get_settings(board):
213213
break
214214

215215
# Append previously failed boards
216-
last_failed_boards = last_failed_jobs.get("boards")
217-
if last_failed_boards:
218-
boards_to_build.update(last_failed_boards)
216+
boards_to_build.update(last_failed_jobs.get("ports") or [])
219217

220218
print("Building boards:", bool(boards_to_build))
221219

@@ -236,7 +234,7 @@ def get_settings(board):
236234
port_to_boards_to_build["ports"] = sorted(list(port_to_boards_to_build.keys()))
237235

238236
# Set the step outputs
239-
set_output("boards", json.dumps(port_to_boards_to_build))
237+
set_output("ports", json.dumps(port_to_boards_to_build))
240238

241239

242240
def set_docs(build_doc: bool):

0 commit comments

Comments
 (0)