3 files changed, 18 insertions, 34 deletions
diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index 9f7e1b310d..12c3bfce45 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -6,22 +6,9 @@
 
 export LC_ALL=C
 
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  # update first to install required ruby dependency
-  travis_retry brew update
-  travis_retry brew reinstall git -- --with-pcre2 # for  --perl-regexp
-  travis_retry brew install grep # gnu grep for --perl-regexp support
-  PATH="$(brew --prefix grep)/libexec/gnubin:$PATH"
-  travis_retry brew install shellcheck
-  travis_retry brew upgrade python
-  PATH="$(brew --prefix python)/bin:$PATH"
-  export PATH
-else
-  SHELLCHECK_VERSION=v0.6.0
-  travis_retry curl --silent "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
-  PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
-  export PATH
-fi
-
 travis_retry pip3 install codespell==1.15.0
 travis_retry pip3 install flake8==3.7.8
+
+SHELLCHECK_VERSION=v0.6.0
+curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
+export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
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