From 05b6f07940f6d942afeae58fc024510e054ce585 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 May 2020 23:01:54 +0200 Subject: Don't fail the build if CPU model or memory can't be detected This is purely informative anyhow and there is no reason to stop the build just because this information couldn't be found (as happens when running in s390x VM, for example). Also avoid useless use of cat. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a71f3e0e3..98a1b6319 100644 --- a/.travis.yml +++ b/.travis.yml @@ -495,7 +495,7 @@ matrix: before_install: - date -u - uname -a - - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi + - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu; grep "model name" /proc/cpuinfo || echo 'Unknown CPU model'; grep "MemTotal" /proc/meminfo || echo 'Unknown system memory amount'; fi - if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi # Travis overrides CC environment with compiler predefined values - if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi -- cgit v1.2.1