From fa677d1801fb9153a95a1fc9855fd5f21fc440c0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 17 Oct 2019 11:31:20 -0400
Subject: ci: Remove redundant check for TRAVIS_OS_NAME

Can be reviewed with
git diff --ignore-all-space --function-context
---
 ci/test/00_setup_env_mac_functional.sh |  3 ++-
 ci/test/05_before_script.sh            | 28 ++++++++++++----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'ci/test')

diff --git a/ci/test/00_setup_env_mac_functional.sh b/ci/test/00_setup_env_mac_functional.sh
index cf19a0962f..e9e68c47a8 100644
--- a/ci/test/00_setup_env_mac_functional.sh
+++ b/ci/test/00_setup_env_mac_functional.sh
@@ -9,10 +9,11 @@ export LC_ALL=C.UTF-8
 export HOST=x86_64-apple-darwin14
 export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config protobuf qt qrencode python3 ccache zeromq"
 export PIP_PACKAGES="zmq"
-export OSX_SDK=10.11
 export RUN_CI_ON_HOST=true
 export RUN_UNIT_TESTS=true
 export RUN_FUNCTIONAL_TESTS=true
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-gui --enable-bip70 --enable-reduce-exports --enable-werror"
+# Run without depends
 export NO_DEPENDS=1
+export OSX_SDK=""
diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh
index 469853cc80..a0488f0807 100755
--- a/ci/test/05_before_script.sh
+++ b/ci/test/05_before_script.sh
@@ -13,21 +13,17 @@ else
   DOCKER_EXEC echo \> \$HOME/.bitcoin
 fi
 
-if [ "$TRAVIS_OS_NAME" != "osx" ]; then
-
-  mkdir -p depends/SDKs depends/sdk-sources
-
-  if [ -n "$OSX_SDK" ] && [ ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
-    curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
-  fi
-  if [ -n "$OSX_SDK" ] && [ -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
-    tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
-  fi
-  if [[ $HOST = *-mingw32 ]]; then
-    DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
-  fi
-  if [ -z "$NO_DEPENDS" ]; then
-    DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
-  fi
+mkdir -p depends/SDKs depends/sdk-sources
 
+if [ -n "$OSX_SDK" ] && [ ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+  curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+fi
+if [ -n "$OSX_SDK" ] && [ -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+  tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+fi
+if [[ $HOST = *-mingw32 ]]; then
+  DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
+fi
+if [ -z "$NO_DEPENDS" ]; then
+  DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
 fi
-- 
cgit v1.2.3