Skip to content

Commit 6fd4600

Browse files
committed
Apply patch from CI
1 parent 02a1651 commit 6fd4600

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

locales/messages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,14 @@
305305
"_CiBaselineRegressionHeader.comment": "Printed before a series of CiBaselineRegression and/or CiBaselineUnexpectedPass messages.",
306306
"CiBaselineRegressionNoPath": "REGRESSION: {spec} failed with {build_result}.",
307307
"_CiBaselineRegressionNoPath.comment": "An example of {spec} is zlib:x64-windows. An example of {build_result} is One of the BuildResultXxx messages (such as BuildResultSucceeded/SUCCEEDED).",
308+
"CiBaselineUnexpectedCascadePass": "REGRESSION: {spec} is marked as pass but one dependency is not supported for {triplet}.",
309+
"_CiBaselineUnexpectedCascadePass.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
308310
"CiBaselineUnexpectedFail": "REGRESSION: {spec} is marked as fail but not supported for {triplet}.",
309311
"_CiBaselineUnexpectedFail.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
310312
"CiBaselineUnexpectedFailCascade": "REGRESSION: {spec} is marked as fail but one dependency is not supported for {triplet}.",
311313
"_CiBaselineUnexpectedFailCascade.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
314+
"CiBaselineUnexpectedFailPass": "REGRESSION: {spec} is marked as pass but not supported for {triplet}.",
315+
"_CiBaselineUnexpectedFailPass.comment": "An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
312316
"CiBaselineUnexpectedPass": "PASSING, REMOVE FROM FAIL LIST: {spec} ({path}).",
313317
"_CiBaselineUnexpectedPass.comment": "An example of {spec} is zlib:x64-windows. An example of {path} is /foo/bar.",
314318
"ClearingContents": "Clearing contents of {path}",

src/vcpkg/commands.ci.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ namespace vcpkg
424424
msg::spec = spec.package_spec,
425425
msg::triplet = spec.package_spec.triplet())
426426
.append_raw('\n');
427-
428427
}
429428
msg += fmt::format("{:>40}: {:>8}\n", spec.package_spec, supp ? "cascade" : "skip");
430429
}

0 commit comments

Comments
 (0)