diff --git a/local/trial-build-patch.R b/local/trial-build-patch.R index 4e8030a..2229074 100644 --- a/local/trial-build-patch.R +++ b/local/trial-build-patch.R @@ -40,23 +40,26 @@ cat(sprintf( patches_dir )) -ok <- tryCatch( - { - bincraft::build_binary_package( - package, - tag_limit = 1L, - patches = patches_dir, - archive = FALSE, - upload = FALSE, - store_build_metadata = FALSE - ) - TRUE - }, +# build_binary_package() catches build failures internally and RETURNS "error" +# for the failed tag rather than throwing (bincraft >= v4.4.7), so inspect the +# return value -- checking only for a thrown exception reports a broken build as +# passing (false green). +res <- tryCatch( + bincraft::build_binary_package( + package, + tag_limit = 1L, + patches = patches_dir, + archive = FALSE, + upload = FALSE, + store_build_metadata = FALSE + ), error = function(e) { - cat(sprintf("Trial build FAILED: %s\n", conditionMessage(e))) - FALSE + cat(sprintf("Trial build FAILED (threw): %s\n", conditionMessage(e))) + "error" } ) +flat <- as.character(unlist(res)) +ok <- length(flat) > 0L && !("error" %in% flat) if (ok) { cat(sprintf("Trial build OK: %s builds with the proposed patch.\n", package))