Skip to content

Commit 9897a01

Browse files
committed
[green] report missing RP2 toolchain before source graph
Keep source-graph validation fail-closed, but run it after the pinned compiler prerequisite so a fresh checkout receives the actionable install guidance promised by the build contract. Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>
1 parent 85543ee commit 9897a01

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

‎firmware/scripts/build_rp2.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ PYBLE_UPSTREAM_DIR="$CANONICAL_UPSTREAM" "$SHA_DRIFT" || {
372372
echo "build_rp2.sh: canonical MicroPython checkout disagrees with versions.lock" >&2
373373
exit 1
374374
}
375-
assert_source_graph "$CANONICAL_UPSTREAM" canonical || exit 1
376375

377376
# 2. The PINNED ARM GNU toolchain must be installed and match the lock
378377
# (BLD-4 equivalent). Never a silent substitution of whatever
@@ -412,6 +411,12 @@ case "$GOT_GCC" in
412411
esac
413412
echo "build_rp2.sh: pinned ARM toolchain OK — $GOT_GCC"
414413

414+
# A missing or mismatched pinned compiler is the first actionable build
415+
# prerequisite. Validate the complete nested source graph only after that
416+
# prerequisite passes, so a fresh checkout cannot mask the install guidance
417+
# with a later source-dependency error.
418+
assert_source_graph "$CANONICAL_UPSTREAM" canonical || exit 1
419+
415420
# Release provenance may say clean=true only after this check.
416421
assert_pyble_source_state || exit 1
417422

0 commit comments

Comments
 (0)