Remove board_check (now using normal matrix), only check on PR/MQ

This was being misused / misunderstood (most were a no-op already).

Also only run check jobs upon pull_request or merge_queue

Author: vidplace7

.github/workflows/main_matrix.yml

@@ -52,12 +52,6 @@ permissions: read-all
 
 jobs:
   setup:
-    strategy:
-      fail-fast: true
-      matrix:
-        arch:
-          - all
-          - check
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v7
@@ -72,16 +66,15 @@ jobs:
           # PRs and (for now) merge_group builds use the narrowed --level pr board
           # subset. Full-matrix builds run on push / schedule / workflow_dispatch.
           if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
-            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level pr)
+            TARGETS=$(./bin/generate_ci_matrix.py all --level pr)
           else
-            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+            TARGETS=$(./bin/generate_ci_matrix.py all)
           fi
           echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
-          echo "${{matrix.arch}}=$TARGETS" >> $GITHUB_OUTPUT
+          echo "all=$TARGETS" >> $GITHUB_OUTPUT
           echo "$TARGETS" >> $GITHUB_STEP_SUMMARY
     outputs:
       all: ${{ steps.jsonStep.outputs.all }}
-      check: ${{ steps.jsonStep.outputs.check }}
 
   version:
     runs-on: ubuntu-latest
@@ -103,11 +96,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        check: ${{ fromJson(needs.setup.outputs.check) }}
+        check: ${{ fromJson(needs.setup.outputs.all) }}
     # Runs on GitHub-hosted runners so checks don't compete with builds for the
     # self-hosted 'arctastic' pool (which builds use).
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'meshtastic' && github.event_name != 'workflow_dispatch' && github.event_name != 'schedule' && github.event.inputs.nightly != 'true'
+    # Only run checks for PRs and Merge Queue runs.
+    if: contains(fromJSON('["pull_request", "merge_group"]'), github.event_name)
     steps:
       - uses: actions/checkout@v7
         with:

bin/generate_ci_matrix.py

@@ -60,31 +60,21 @@
   env = {
     "ci": {"board": pio_env, "platform": env_platform},
     "board_level": board_level,
-    "board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
   }
   all_envs.append(env)
 
-# Filter outputs based on options
-# Check is mutually exclusive with other options (except 'pr')
-if "check" in args.platform:
-  for env in all_envs:
-    if env["board_check"]:
-      # '--level pr' narrows to the PR subset; otherwise check every level
-      if "pr" not in args.level or env["board_level"] == "pr":
-        outlist.append(env["ci"])
-# Filter (non-check) builds by platform
-else:
-  for env in all_envs:
-    if args.platform == env["ci"]["platform"] or args.platform == "all":
-      # Always include board_level = 'pr'
-      if env["board_level"] == "pr":
-        outlist.append(env["ci"])
-      # Include board_level = 'extra' when requested
-      elif "extra" in args.level and env["board_level"] == "extra":
-        outlist.append(env["ci"])
-      # Include board_level = 'release' unless narrowed to the PR subset
-      elif "pr" not in args.level and env["board_level"] == "release":
-        outlist.append(env["ci"])
+# Filter builds by platform
+for env in all_envs:
+  if args.platform == env["ci"]["platform"] or args.platform == "all":
+    # Always include board_level = 'pr'
+    if env["board_level"] == "pr":
+      outlist.append(env["ci"])
+    # Include board_level = 'extra' when requested
+    elif "extra" in args.level and env["board_level"] == "extra":
+      outlist.append(env["ci"])
+    # Include board_level = 'release' unless narrowed to the PR subset
+    elif "pr" not in args.level and env["board_level"] == "release":
+      outlist.append(env["ci"])
 
 # Return as a JSON list
 print(json.dumps(outlist))

variants/esp32/diy/v1/platformio.ini

@@ -12,7 +12,6 @@ custom_meshtastic_tags = DIY
 extends = esp32_base
 board_level = release
 board = esp32doit-devkit-v1
-board_check = true
 build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1

variants/esp32/m5stack_coreink/platformio.ini

@@ -2,7 +2,6 @@
 extends = esp32_base
 board_level = release
 board = m5stack-coreink
-board_check = true
 build_src_filter = 
   ${esp32_base.build_src_filter}
 build_flags = 

variants/esp32/rak11200/platformio.ini

@@ -11,7 +11,6 @@ custom_meshtastic_tags = RAK
 extends = esp32_base
 board_level = release
 board = wiscore_rak11200
-board_check = true
 build_flags = 
   ${esp32_base.build_flags}
   -D RAK_11200

variants/esp32/tbeam/platformio.ini

@@ -13,7 +13,6 @@ extends = esp32_base
 board_level = release
 board = ttgo-tbeam
 
-board_check = true
 build_flags = ${esp32_base.build_flags}
   -D TBEAM_V10
   -I variants/esp32/tbeam

variants/esp32/tlora_v2_1_16/platformio.ini

@@ -11,7 +11,6 @@ custom_meshtastic_tags = LilyGo
 extends = esp32_base
 board_level = release
 board = ttgo-lora32-v21
-board_check = true
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
 upload_speed = 115200

variants/esp32s2/nugget_s2_lora/platformio.ini

@@ -2,7 +2,6 @@
 extends = esp32s2_base
 board = lolin_s2_mini
 board_level = extra
-board_check = true
 build_flags = 
   ${esp32s2_base.build_flags}
   -D PRIVATE_HW

variants/esp32s3/elecrow_panel/platformio.ini

@@ -1,7 +1,6 @@
 [crowpanel_base]
 extends = esp32s3_base
 board = crowpanel
-board_check = true
 upload_protocol = esptool
 board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !?
 build_flags = ${esp32s3_base.build_flags} -Os

variants/esp32s3/hackaday-communicator/platformio.ini

@@ -3,7 +3,6 @@
 extends = esp32s3_base
 board_level = release
 board = hackaday-communicator
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool