trunk-merge/pr-1265/6837f838-0dbd-4dd0-bc2b-335ca189367e

api/src/urls.rs

@@ -151,6 +151,8 @@ mod tests {
             timestamp_millis: None,
             is_quarantined: false,
             failure_message: None,
+            failure_message_attribute: None,
+            failure_text: None,
             variant: None,
         }
     }

api/tests/v2_client.rs

@@ -117,6 +117,8 @@ fn failure(index: usize) -> Test {
         timestamp_millis: None,
         is_quarantined: false,
         failure_message: None,
+        failure_message_attribute: None,
+        failure_text: None,
         variant: None,
     }
 }

bundle/src/types.rs

@@ -23,7 +23,14 @@ pub struct Test {
     /// Added in v0.6.9
     pub timestamp_millis: Option<i64>,
     pub is_quarantined: bool,
+    /// What's uploaded: the failure's text, else its `message` attribute.
     pub failure_message: Option<String>,
+    /// The failure's `message` attribute, kept apart for the CLI's summary. Not uploaded.
+    #[serde(skip)]
+    pub failure_message_attribute: Option<String>,
+    /// The failure's text, usually a stack trace, kept apart for the CLI's summary. Not uploaded.
+    #[serde(skip)]
+    pub failure_text: Option<String>,
     pub variant: Option<String>,
 }
 
@@ -49,6 +56,8 @@ impl Test {
             timestamp_millis,
             is_quarantined: false,
             failure_message: None,
+            failure_message_attribute: None,
+            failure_text: None,
             variant: Some(variant.to_string()),
         };
 
@@ -198,6 +207,8 @@ mod tests {
             timestamp_millis: Some(0),
             is_quarantined: false,
             failure_message: None,
+            failure_message_attribute: None,
+            failure_text: None,
             variant: Some(String::new()),
         };
         assert_eq!(result.name, name);

cli/Cargo.toml

@@ -24,7 +24,6 @@ context = { path = "../context", features = ["bindings"] }
 third-party = { path = "../third-party" }
 display = { path = "../display" }
 log = "0.4.14"
-exitcode = "1.1.1"
 gix = { version = "0.74.0", default-features = false, features = [
 ], optional = true }
 http = "1.1.0"
@@ -50,7 +49,10 @@ sentry-tracing = "0.36.0"
 openssl = { version = "0.10.78", features = ["vendored"] }
 openssl-src = { version = "=300.3.1", optional = true }
 quick-junit = "0.5.0"
+schemars = "1.2"
+serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0"
+strum = { version = "0.27", features = ["derive"] }
 clap-verbosity-flag = "3.0.2"
 proto = { path = "../proto" }
 regex = "1.11.1"

cli/src/context.rs

@@ -44,6 +44,7 @@ use xcresult::test_locations::{Limits, TestKey, TestLocationIndex};
 use xcresult::xcresult::XCResult;
 
 use crate::error_report::InterruptingError;
+use crate::exit_code::ExitCode;
 use crate::{
     context_quarantine::{
         FailedTestsExtractor, QuarantineContext, QuarantineFetchStatus, gather_quarantine_context,
@@ -811,7 +812,7 @@ pub async fn gather_exit_code_and_quarantined_tests_context(
     disable_quarantining: bool,
     api_client: &ApiClient,
     file_set_builder: &FileSetBuilder,
-    default_exit_code: Option<i32>,
+    default_exit_code: Option<ExitCode>,
     test_collection_short_id: Option<String>,
     hide_test_collection_links: bool,
 ) -> anyhow::Result<QuarantineContext> {