From b8cd6e5d7b885d3af2832cbe4a684ce6e6cf3614 Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Sat, 10 Mar 2018 18:38:27 +0800
Subject: [PATCH 1/2] Prevents the crash log printer on macOS from crashing the
 entire job.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4eff6337ad8c9..8315cc9f90f1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -275,11 +275,12 @@ after_failure:
   - ls -lat $HOME/Library/Logs/DiagnosticReports/
   - find $HOME/Library/Logs/DiagnosticReports
       -type f
+      -name '*.crash'
       -not -name '*.stage2-*.crash'
       -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash'
       -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \;
       -exec head -750 {} \;
-      -exec echo travis_fold":"end:crashlog \;
+      -exec echo travis_fold":"end:crashlog \; || true
 
   # attempt to debug anything killed by the oom killer on linux, just to see if
   # it happened

From c67e55338442071666da7fb310b064b8e31fbacb Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Sat, 10 Mar 2018 19:55:04 +0800
Subject: [PATCH 2/2] Print /proc/cpuinfo and /proc/meminfo before starting to
 build.

---
 src/ci/run.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/ci/run.sh b/src/ci/run.sh
index 79300e08a7d36..7ce50d5c2000b 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -91,11 +91,19 @@ make check-bootstrap
 travis_fold end check-bootstrap
 travis_time_finish
 
+# Display the CPU and memory information. This helps us know why the CI timing
+# is fluctuating.
+travis_fold start log-system-info
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    system_profiler SPHardwareDataType || true
+    sysctl hw || true
     ncpus=$(sysctl -n hw.ncpu)
 else
+    cat /proc/cpuinfo || true
+    cat /proc/meminfo || true
     ncpus=$(grep processor /proc/cpuinfo | wc -l)
 fi
+travis_fold end log-system-info
 
 if [ ! -z "$SCRIPT" ]; then
   sh -x -c "$SCRIPT"