Skip to content

Commit 5ecd288

Browse files
committed
Merge branch 'ci/fixes'
2 parents 4a68204 + 4d91d7d commit 5ecd288

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.github/scripts/tests_matrix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [[ $IS_PR != 'true' ]] || [[ $PERFORMANCE_ENABLED == 'true' ]]; then
1212
#qemu_types+=",'performance'"
1313
fi
1414

15-
hw_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c5','esp32c6','esp32h2','esp32p4'"
15+
hw_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
1616
wokwi_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
1717
qemu_targets="'esp32','esp32c3'"
1818

.github/workflows/push.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,17 @@ jobs:
188188

189189
steps:
190190
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
191+
191192
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.0.4
192193
with:
193194
python-version: "3.x"
195+
196+
- name: Install yq (Windows)
197+
if: matrix.os == 'windows-latest'
198+
run: |
199+
choco install yq -y
200+
yq --version
201+
194202
- name: Build Sketches
195203
run: bash ./.github/scripts/on-push.sh
196204

.gitlab/scripts/gen_hw_jobs.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def main():
360360
# Discover available runners (best-effort)
361361
available_runners = list_project_runners()
362362
if not available_runners:
363-
print("[WARN] Could not enumerate project runners or none found; skipping runner-tag availability checks.")
363+
print("[WARN] Could not enumerate project runners or none found; using conservative mode for tagged groups.")
364364

365365
# Accumulate all missing-runner groups to emit a single stub job
366366
missing_groups: list[dict] = []
@@ -375,6 +375,14 @@ def main():
375375
can_schedule = True
376376
if available_runners:
377377
can_schedule = any_runner_matches(tag_list, available_runners)
378+
else:
379+
# Conservative mode when we cannot list runners: treat groups that require extra
380+
# tags beyond the SOC or 'generic' as missing-runner to avoid running on generic.
381+
assume_missing = os.environ.get("ASSUME_TAGGED_GROUPS_MISSING", "1") == "1"
382+
if assume_missing:
383+
extra = [t for t in tag_list if t not in (chip, "generic")]
384+
if extra:
385+
can_schedule = False
378386

379387
if can_schedule:
380388
job_name = f"hw-{chip}-{test_type}-{tag_suffix}"[:255]

0 commit comments

Comments
 (0)