File tree Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ export HOST=x86_64-apple-darwin16
10
10
export PIP_PACKAGES=" zmq"
11
11
export GOAL=" install"
12
12
export BITCOIN_CONFIG=" --with-gui --enable-reduce-exports --enable-werror --with-boost-process"
13
+ export CI_OS_NAME=" macos"
13
14
export NO_DEPENDS=1
14
15
export OSX_SDK=" "
15
16
export CCACHE_SIZE=300M
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
13
13
export LC_ALL=C
14
14
fi
15
15
16
- if [ " $TRAVIS_OS_NAME " == " osx " ]; then
16
+ if [ " $CI_OS_NAME " == " macos " ]; then
17
17
${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
18
18
fi
19
19
@@ -69,16 +69,16 @@ elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
69
69
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
70
70
fi
71
71
72
- if [ " $TRAVIS_OS_NAME " == " osx " ]; then
72
+ if [ " $CI_OS_NAME " == " macos " ]; then
73
73
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
74
74
echo " Number of CPUs: $( sysctl -n hw.logicalcpu) "
75
75
else
76
76
DOCKER_EXEC free -m -h
77
77
DOCKER_EXEC echo " Number of CPUs \(nproc\):" \$\( nproc\)
78
78
DOCKER_EXEC echo $( lscpu | grep Endian)
79
- DOCKER_EXEC echo " Free disk space:"
80
- DOCKER_EXEC df -h
81
79
fi
80
+ DOCKER_EXEC echo " Free disk space:"
81
+ DOCKER_EXEC df -h
82
82
83
83
if [ ! -d ${DIR_QA_ASSETS} ]; then
84
84
DOCKER_EXEC git clone --depth=1 https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}
Original file line number Diff line number Diff line change 7
7
export LC_ALL=C.UTF-8
8
8
9
9
# 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
11
11
echo > $HOME /Library/Application\ Support/Bitcoin
12
12
else
13
13
DOCKER_EXEC echo \> \$ HOME/.bitcoin
You can’t perform that action at this time.
0 commit comments