diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-08 11:28:24 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-09 10:15:48 +0100 |
| commit | fa0795f54dc5268bacc6acdfdbe23f9952a0e7d8 (patch) | |
| tree | 56d37a64d138ef108768b7d8e9ac0545834a800c /ci/test/04_install.sh | |
| parent | fafce1a13a65cc3ae0cd5351648bb0290f9bfe8c (diff) | |
| download | bitcoin-fa0795f54dc5268bacc6acdfdbe23f9952a0e7d8.tar.xz | |
ci: Replace TRAVIS_OS_NAME with CI_OS_NAME
Also enable free disk space check unconditionally
Diffstat (limited to 'ci/test/04_install.sh')
| -rwxr-xr-x | ci/test/04_install.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 632bccf574..b0f802186d 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -13,7 +13,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then export LC_ALL=C fi -if [ "$TRAVIS_OS_NAME" == "osx" ]; then +if [ "$CI_OS_NAME" == "macos" ]; then ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES fi @@ -69,16 +69,16 @@ elif [ "$CI_USE_APT_INSTALL" != "no" ]; then ${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES fi -if [ "$TRAVIS_OS_NAME" == "osx" ]; then +if [ "$CI_OS_NAME" == "macos" ]; then top -l 1 -s 0 | awk ' /PhysMem/ {print}' echo "Number of CPUs: $(sysctl -n hw.logicalcpu)" else DOCKER_EXEC free -m -h DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\) DOCKER_EXEC echo $(lscpu | grep Endian) - DOCKER_EXEC echo "Free disk space:" - DOCKER_EXEC df -h fi +DOCKER_EXEC echo "Free disk space:" +DOCKER_EXEC df -h if [ ! -d ${DIR_QA_ASSETS} ]; then DOCKER_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS} |