Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/third_party/rust/minidump-writer/src/mac/streams/module_list.rs b/third_party/rust/minidump-writer/src/mac/streams/module_list.rs
index 2b4d13ea74..d1307c80a8 100644
--- a/third_party/rust/minidump-writer/src/mac/streams/module_list.rs
+++ b/third_party/rust/minidump-writer/src/mac/streams/module_list.rs
@@ -344,6 +344,14 @@ mod test {
     /// both the local and intra-process scenarios
     #[test]
     fn images_match() {
+        if std::env::var_os("CI").is_some() && cfg!(target_arch = "aarch64") {
+            // https://github.com/rust-minidump/minidump-writer/issues/101
+            println!(
+                "this fails on github actions but works on a local aarch64-apple-darwin machine..."
+            );
+            return;
+        }
+
         let mdw = MinidumpWriter::new(None, None);
         let td = TaskDumper::new(mdw.task);