diff options
| author | Vadim Zeitlin <vz-swig@zeitlins.org> | 2020-05-25 23:01:54 +0200 |
|---|---|---|
| committer | Vadim Zeitlin <vz-swig@zeitlins.org> | 2020-05-26 01:23:28 +0200 |
| commit | 05b6f07940f6d942afeae58fc024510e054ce585 (patch) | |
| tree | cf4d8bcc2bffcf934a0c0d38780c4389e3884abf /.travis.yml | |
| parent | c71885d23779f51ccd9d66bce686faaaa44c6ea0 (diff) | |
| download | swig-05b6f07940f6d942afeae58fc024510e054ce585.tar.gz | |
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.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |