Skip to content

Commit fa0795f

Browse files
author
MarcoFalke
committed
ci: Replace TRAVIS_OS_NAME with CI_OS_NAME
Also enable free disk space check unconditionally
1 parent fafce1a commit fa0795f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ci/test/00_setup_env_mac_host.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export HOST=x86_64-apple-darwin16
1010
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
1212
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
13+
export CI_OS_NAME="macos"
1314
export NO_DEPENDS=1
1415
export OSX_SDK=""
1516
export CCACHE_SIZE=300M

ci/test/04_install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1313
export LC_ALL=C
1414
fi
1515

16-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
16+
if [ "$CI_OS_NAME" == "macos" ]; then
1717
${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
1818
fi
1919

@@ -69,16 +69,16 @@ elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
6969
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
7070
fi
7171

72-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
72+
if [ "$CI_OS_NAME" == "macos" ]; then
7373
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
7474
echo "Number of CPUs: $(sysctl -n hw.logicalcpu)"
7575
else
7676
DOCKER_EXEC free -m -h
7777
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
7878
DOCKER_EXEC echo $(lscpu | grep Endian)
79-
DOCKER_EXEC echo "Free disk space:"
80-
DOCKER_EXEC df -h
8179
fi
80+
DOCKER_EXEC echo "Free disk space:"
81+
DOCKER_EXEC df -h
8282

8383
if [ ! -d ${DIR_QA_ASSETS} ]; then
8484
DOCKER_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}

ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
# Make sure default datadir does not exist and is never read by creating a dummy file
10-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
10+
if [ "$CI_OS_NAME" == "macos" ]; then
1111
echo > $HOME/Library/Application\ Support/Bitcoin
1212
else
1313
DOCKER_EXEC echo \> \$HOME/.bitcoin

0 commit comments

Comments
 (0)