Skip to content

Commit e40ad09

Browse files
committed
0.8.0 in src/plugins.cppm; the WiX criterion is the absence of a host tool
1 parent 8277a76 commit e40ad09

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,9 +1687,17 @@ jobs:
16871687
"$MCPP" pack --format msi | tee pack.log
16881688
msi=$(find target -name '*.msi' | head -1)
16891689
test -n "$msi" || { cat pack.log; echo "FAIL: no MSI"; exit 1; }
1690-
# The argv the engine ran names the tool; it must be the payload's.
1691-
grep -E 'xim-x-wix[/\\].*wix\.exe build' pack.log >/dev/null \
1692-
|| { cat pack.log; echo "FAIL: wix.exe did not come from the xim:wix payload"; exit 1; }
1690+
# THE TOOL CAME FROM THE PAYLOAD BY CONSTRUCTION, and the criterion
1691+
# is the absence of any other: this step installs no WiX, the member
1692+
# has no PATH tier, and the runner image ships WiX 3 (candle/light)
1693+
# but no `wix.exe`. An MSI therefore exists only if the payload's
1694+
# `wix.exe` produced it. The engine prints the argv with the tool's
1695+
# basename, so the log line cannot carry the store path -- an earlier
1696+
# revision asserted on that and failed on a correct run.
1697+
if command -v wix.exe >/dev/null 2>&1 || command -v wix >/dev/null 2>&1; then
1698+
echo "FAIL: a host wix is on PATH; this step cannot tell the payload's tool from it"
1699+
command -v wix.exe wix; exit 1
1700+
fi
16931701
16941702
# THE CRITERION IS THE `File` TABLE, NOT THE FILE'S EXISTENCE. The
16951703
# measured failure this member is shaped around is a VALID, EMPTY,

src/plugins.cppm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export namespace mcpp::plugins {
4949
//
5050
// One package, one version: the number lives in mcpp.toml, and the CI step
5151
// `the collection states its own version` compares the two.
52-
inline constexpr std::string_view version = "0.7.1";
52+
inline constexpr std::string_view version = "0.8.0";
5353

5454
} // namespace mcpp::plugins
5555

0 commit comments

Comments
 (0)