Skip to content

Commit f3436bf

Browse files
committed
CI: a build program that ran is known by its compiled file, not by its status line
check-deps-and-qt.sh asserted that the qt import-only package runs no build program with `! grep -q 'build.mcpp running'`. mcpp 2026.9.29.5 writes one line per program (`build.mcpp <package> ran <time>`), so that search would pass whether or not a program ran once the CI's mcpp pin moves past it. A program that runs is compiled first into the package's target/, so the check now asks for build.mcpp.bin or build.mcpp.exe there, which holds for every mcpp version.
1 parent fd8ed81 commit f3436bf

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

‎.github/scripts/check-deps-and-qt.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,11 @@ qt_import_only() {
361361
rm -rf target
362362
mkdir -p target/ci
363363
"$MCPP" build 2>&1 | tee target/ci/build.log
364-
! grep -q 'build.mcpp running' target/ci/build.log ||
364+
# A build program that ran was compiled first, into the package's
365+
# target/: the program file is the evidence. The line mcpp prints for it
366+
# is not (mcpp 2026.9.29.5 replaced `build.mcpp running <package>` with one
367+
# line per program, and a search for the old words would pass either way).
368+
! find target -name 'build.mcpp.bin' -o -name 'build.mcpp.exe' | grep -q . ||
365369
fail "mcpp synthesised a build program for a package with no Qt source (mcpp#715)"
366370
! grep -q 'no Qt SDK' target/ci/build.log ||
367371
fail "a package with no Qt source reported a missing SDK"

0 commit comments

Comments
 (0)