From d28a4122048b334079922e9d11fe2d155ae1a635 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 18 Oct 2019 20:04:44 -0400 Subject: [PATCH] always show cpuinfo --- src/travis/linux-arm64-before-install.sh | 7 +++---- src/travis/linux-x86_64-before-install.sh | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/travis/linux-arm64-before-install.sh b/src/travis/linux-arm64-before-install.sh index 8a6ffb4c..b73639b2 100755 --- a/src/travis/linux-arm64-before-install.sh +++ b/src/travis/linux-arm64-before-install.sh @@ -2,6 +2,9 @@ export whereibelong=$(pwd) export dist=$(lsb_release --codename --short) echo "We are running on Ubuntu $dist" export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib +cat /proc/cpuinfo +cpucount=$(nproc --all) +echo "This device has $cpucount CPUs for compiling..." SSLVER=$(~/ssl/bin/openssl version) SSLRESULT=$? PYVER=$(~/python/bin/python3 -V) @@ -23,10 +26,6 @@ if [ $SSLRESULT -ne 0 ] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]] sudo apt-get -qq --yes build-dep python3 > /dev/null sudo apt-get -qq --yes install zlib1g-dev > /dev/null - cat /proc/cpuinfo - cpucount=$(nproc --all) - echo "This device has $cpucount CPUs for compiling..." - # Compile latest OpenSSL echo "Downloading OpenSSL..." wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index 128da1eb..67c148ec 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -8,6 +8,9 @@ else export dist=$(lsb_release --codename --short) echo "We are running on Ubuntu $dist" export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib + cat /proc/cpuinfo + cpucount=$(nproc --all) + echo "This device has $cpucount CPUs for compiling..." SSLVER=$(~/ssl/bin/openssl version) SSLRESULT=$? PYVER=$(~/python/bin/python3 -V) @@ -44,9 +47,6 @@ else sudo cp -v /tmp/sources.list /etc/apt sudo apt-get -qq --yes update > /dev/null sudo apt-get -qq --yes build-dep python3 > /dev/null - cat /proc/cpuinfo - cpucount=$(nproc --all) - echo "This device has $cpucount CPUs for compiling..." # Compile latest OpenSSL wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz