Skip to content

Commit 9ab73d7

Browse files
committed
ci(measure): an absent runtime copy in qt-base is not a failed install
qt-base revision 1 no longer ships the VC++ runtime DLLs the step removes, so its listing exited 2 and bash -e failed the step before any measurement.
1 parent 55d2d51 commit 9ab73d7

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎.github/workflows/measure-windows-tool-crt.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,10 @@ jobs:
113113
"$XLINGS_BIN" install qt-base@6.11.1 -y
114114
QT="$(cygpath -u "$USERPROFILE")/.xlings/data/xpkgs/xim-x-qt-base/6.11.1"
115115
test -x "$QT/bin/moc.exe" || { echo "::error::no moc.exe in $QT/bin"; exit 1; }
116-
# What revision 1 of the recipe removes (task I2).
117-
( cd "$QT/bin" && ls vcruntime140*.dll msvcp140*.dll concrt140.dll vccorlib140.dll 2>/dev/null; \
116+
# What revision 1 of the recipe removes (task I2). The published
117+
# revision 1 no longer carries them, and `ls` of absent files exits 2,
118+
# which `bash -e` would read as a failed install.
119+
( cd "$QT/bin" && { ls vcruntime140*.dll msvcp140*.dll concrt140.dll vccorlib140.dll 2>/dev/null || true; }; \
118120
rm -f vcruntime140*.dll msvcp140*.dll concrt140.dll vccorlib140.dll )
119121
echo "QT=$QT" >> "$GITHUB_ENV"
120122

0 commit comments

Comments
 (0)