Skip to content

Commit 5f2efb0

Browse files
committed
Auto merge of #48907 - kennytm:minor-ci-stuff, r=alexcrichton
Some minor CI changes 1. On macOS, ensure crash log printing won't error, and only real crash logs are printed. This may avoid the `find` process exiting abnormally and truncated the Travis log (I guess). 2. Print `/proc/cpuinfo` and `/proc/meminfo`. To determine if there's any variation in the reported clock rate between jobs.
2 parents e5acb0c + c67e553 commit 5f2efb0

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,12 @@ after_failure:
275275
- ls -lat $HOME/Library/Logs/DiagnosticReports/
276276
- find $HOME/Library/Logs/DiagnosticReports
277277
-type f
278+
-name '*.crash'
278279
-not -name '*.stage2-*.crash'
279280
-not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash'
280281
-exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \;
281282
-exec head -750 {} \;
282-
-exec echo travis_fold":"end:crashlog \;
283+
-exec echo travis_fold":"end:crashlog \; || true
283284

284285
# attempt to debug anything killed by the oom killer on linux, just to see if
285286
# it happened

src/ci/run.sh

+8
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,19 @@ make check-bootstrap
9191
travis_fold end check-bootstrap
9292
travis_time_finish
9393

94+
# Display the CPU and memory information. This helps us know why the CI timing
95+
# is fluctuating.
96+
travis_fold start log-system-info
9497
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
98+
system_profiler SPHardwareDataType || true
99+
sysctl hw || true
95100
ncpus=$(sysctl -n hw.ncpu)
96101
else
102+
cat /proc/cpuinfo || true
103+
cat /proc/meminfo || true
97104
ncpus=$(grep processor /proc/cpuinfo | wc -l)
98105
fi
106+
travis_fold end log-system-info
99107

100108
if [ ! -z "$SCRIPT" ]; then
101109
sh -x -c "$SCRIPT"

0 commit comments

Comments
 (0)