aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2023-06-19 19:55:24 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2023-06-19 19:56:06 +0300
commit9167a07319cd8b35d27d740af63d593fb6c37d0b (patch)
tree65b7b17cd4ee2dceb8c5ea81461a8c6ab8f9ccaf
parent5463ad8a23cf11373a9401500b1592f3c98a4ded (diff)
Fix worker not to redefine upload-status result manifest value
-rw-r--r--bbot/worker/worker.cxx13
1 files changed, 12 insertions, 1 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 366d75a..985d77e 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -5664,7 +5664,18 @@ build (size_t argc, const char* argv[])
*bkp_step >= step_id::bbot_upload &&
*bkp_step <= step_id::bbot_upload_tar_list)
{
- fail_unreached_breakpoint (add_result ("upload"));
+ // If the upload operation log have been added as part of the build
+ // artifacts preparation for upload, then use this log to report the
+ // error. Otherwise, add the new log for that.
+ //
+ // @@ TMP: Apple Clang 14.0.3 ICE
+ //
+ operation_result* pr (&rm.results.back ());
+
+ if (pr->operation != "upload")
+ pr = &add_result ("upload");
+
+ fail_unreached_breakpoint (*pr);
break;
}
}