Skip to content

Commit fa677d1

Browse files
author
MarcoFalke
committed
ci: Remove redundant check for TRAVIS_OS_NAME
Can be reviewed with git diff --ignore-all-space --function-context
1 parent fadccb2 commit fa677d1

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

ci/test/00_setup_env_mac_functional.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ export LC_ALL=C.UTF-8
99
export HOST=x86_64-apple-darwin14
1010
export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config protobuf qt qrencode python3 ccache zeromq"
1111
export PIP_PACKAGES="zmq"
12-
export OSX_SDK=10.11
1312
export RUN_CI_ON_HOST=true
1413
export RUN_UNIT_TESTS=true
1514
export RUN_FUNCTIONAL_TESTS=true
1615
export GOAL="install"
1716
export BITCOIN_CONFIG="--enable-gui --enable-bip70 --enable-reduce-exports --enable-werror"
17+
# Run without depends
1818
export NO_DEPENDS=1
19+
export OSX_SDK=""

ci/test/05_before_script.sh

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,17 @@ else
1313
DOCKER_EXEC echo \> \$HOME/.bitcoin
1414
fi
1515

16-
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
17-
18-
mkdir -p depends/SDKs depends/sdk-sources
19-
20-
if [ -n "$OSX_SDK" ] && [ ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
21-
curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
22-
fi
23-
if [ -n "$OSX_SDK" ] && [ -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
24-
tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
25-
fi
26-
if [[ $HOST = *-mingw32 ]]; then
27-
DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
28-
fi
29-
if [ -z "$NO_DEPENDS" ]; then
30-
DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
31-
fi
16+
mkdir -p depends/SDKs depends/sdk-sources
3217

18+
if [ -n "$OSX_SDK" ] && [ ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
19+
curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
20+
fi
21+
if [ -n "$OSX_SDK" ] && [ -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
22+
tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
23+
fi
24+
if [[ $HOST = *-mingw32 ]]; then
25+
DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
26+
fi
27+
if [ -z "$NO_DEPENDS" ]; then
28+
DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
3329
fi

0 commit comments

Comments
 (0)