Skip to content

Commit 8d3ad2a

Browse files
authored
Remove board_check (now using normal matrix) (#11312)
This was being misused / misunderstood (most were a no-op already).
1 parent 854eae4 commit 8d3ad2a

59 files changed

Lines changed: 16 additions & 97 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main_matrix.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ permissions: read-all
5252

5353
jobs:
5454
setup:
55-
strategy:
56-
fail-fast: true
57-
matrix:
58-
arch:
59-
- all
60-
- check
6155
runs-on: ubuntu-24.04
6256
steps:
6357
- uses: actions/checkout@v7
@@ -72,16 +66,15 @@ jobs:
7266
# PRs and (for now) merge_group builds use the narrowed --level pr board
7367
# subset. Full-matrix builds run on push / schedule / workflow_dispatch.
7468
if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
75-
TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level pr)
69+
TARGETS=$(./bin/generate_ci_matrix.py all --level pr)
7670
else
77-
TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
71+
TARGETS=$(./bin/generate_ci_matrix.py all)
7872
fi
7973
echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
80-
echo "${{matrix.arch}}=$TARGETS" >> $GITHUB_OUTPUT
74+
echo "all=$TARGETS" >> $GITHUB_OUTPUT
8175
echo "$TARGETS" >> $GITHUB_STEP_SUMMARY
8276
outputs:
8377
all: ${{ steps.jsonStep.outputs.all }}
84-
check: ${{ steps.jsonStep.outputs.check }}
8578

8679
version:
8780
runs-on: ubuntu-latest
@@ -103,7 +96,7 @@ jobs:
10396
strategy:
10497
fail-fast: false
10598
matrix:
106-
check: ${{ fromJson(needs.setup.outputs.check) }}
99+
check: ${{ fromJson(needs.setup.outputs.all) }}
107100
# Runs on GitHub-hosted runners so checks don't compete with builds for the
108101
# self-hosted 'arctastic' pool (which builds use).
109102
runs-on: ubuntu-latest

bin/generate_ci_matrix.py

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,21 @@
6060
env = {
6161
"ci": {"board": pio_env, "platform": env_platform},
6262
"board_level": board_level,
63-
"board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
6463
}
6564
all_envs.append(env)
6665

67-
# Filter outputs based on options
68-
# Check is mutually exclusive with other options (except 'pr')
69-
if "check" in args.platform:
70-
for env in all_envs:
71-
if env["board_check"]:
72-
# '--level pr' narrows to the PR subset; otherwise check every level
73-
if "pr" not in args.level or env["board_level"] == "pr":
74-
outlist.append(env["ci"])
75-
# Filter (non-check) builds by platform
76-
else:
77-
for env in all_envs:
78-
if args.platform == env["ci"]["platform"] or args.platform == "all":
79-
# Always include board_level = 'pr'
80-
if env["board_level"] == "pr":
81-
outlist.append(env["ci"])
82-
# Include board_level = 'extra' when requested
83-
elif "extra" in args.level and env["board_level"] == "extra":
84-
outlist.append(env["ci"])
85-
# Include board_level = 'release' unless narrowed to the PR subset
86-
elif "pr" not in args.level and env["board_level"] == "release":
87-
outlist.append(env["ci"])
66+
# Filter builds by platform
67+
for env in all_envs:
68+
if args.platform == env["ci"]["platform"] or args.platform == "all":
69+
# Always include board_level = 'pr'
70+
if env["board_level"] == "pr":
71+
outlist.append(env["ci"])
72+
# Include board_level = 'extra' when requested
73+
elif "extra" in args.level and env["board_level"] == "extra":
74+
outlist.append(env["ci"])
75+
# Include board_level = 'release' unless narrowed to the PR subset
76+
elif "pr" not in args.level and env["board_level"] == "release":
77+
outlist.append(env["ci"])
8878

8979
# Return as a JSON list
9080
print(json.dumps(outlist))

variants/esp32/diy/v1/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ custom_meshtastic_tags = DIY
1212
extends = esp32_base
1313
board_level = release
1414
board = esp32doit-devkit-v1
15-
board_check = true
1615
build_flags =
1716
${esp32_base.build_flags}
1817
-D DIY_V1

variants/esp32/m5stack_coreink/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
extends = esp32_base
33
board_level = release
44
board = m5stack-coreink
5-
board_check = true
65
build_src_filter =
76
${esp32_base.build_src_filter}
87
build_flags =

variants/esp32/rak11200/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ custom_meshtastic_tags = RAK
1111
extends = esp32_base
1212
board_level = release
1313
board = wiscore_rak11200
14-
board_check = true
1514
build_flags =
1615
${esp32_base.build_flags}
1716
-D RAK_11200

variants/esp32/tbeam/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ extends = esp32_base
1313
board_level = release
1414
board = ttgo-tbeam
1515

16-
board_check = true
1716
build_flags = ${esp32_base.build_flags}
1817
-D TBEAM_V10
1918
-I variants/esp32/tbeam

variants/esp32/tlora_v2_1_16/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ custom_meshtastic_tags = LilyGo
1111
extends = esp32_base
1212
board_level = release
1313
board = ttgo-lora32-v21
14-
board_check = true
1514
build_flags =
1615
${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
1716
upload_speed = 115200

variants/esp32s2/nugget_s2_lora/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
extends = esp32s2_base
33
board = lolin_s2_mini
44
board_level = extra
5-
board_check = true
65
build_flags =
76
${esp32s2_base.build_flags}
87
-D PRIVATE_HW

variants/esp32s3/elecrow_panel/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[crowpanel_base]
22
extends = esp32s3_base
33
board = crowpanel
4-
board_check = true
54
upload_protocol = esptool
65
board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !?
76
build_flags = ${esp32s3_base.build_flags} -Os

variants/esp32s3/hackaday-communicator/platformio.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
extends = esp32s3_base
44
board_level = release
55
board = hackaday-communicator
6-
board_check = true
76
board_build.partitions = default_16MB.csv
87
upload_protocol = esptool
98

0 commit comments

Comments
 (0)