From df70e745b0048d61ff728e81689d449bcbe69298 Mon Sep 17 00:00:00 2001
From: Iakov 'Jake' Kirilenko <Jake.Kirilenko@gmail.com>
Date: Thu, 29 Nov 2018 17:13:42 +0300
Subject: [PATCH] macOS build issue with brew fixed

---
 .travis/install.sh          | 11 ++++++-----
 docker/Dockerfile           |  2 +-
 tests/thirdparty/googletest |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 128db1353..9a4ea2345 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -10,13 +10,14 @@ case $TRAVIS_OS_NAME in
       rmdir $CELLAR_CACHE_DIR/$p && brew install $pkg \
       || { brew unlink $p ; brew link --force $p ; }
     done
-    brew update && brew upgrade $REQUIRED_PACKAGES
+    brew update && brew upgrade $REQUIRED_PACKAGES || true
     # export PYENV_ROOT="$CELLAR_CACHE_DIR/.pyenv"
     export PATH="$(pyenv root)/bin:$PATH"
     eval "$(pyenv init -)"
-    #pyenv update || true
-    pyenv install --list
-    env CFLAGS="-O2 -fPIC" pyenv install -s 3.5.6
+    BEST_AVAILABLE_PYTHON_VERSION=$(pyenv install --list | grep -E '^\s*3\.5\.[0-9]+$' | sort -ruVifb | head -n 1)
+    echo "From pyenv the best matched version is $BEST_AVAILABLE_PYTHON_VERSION"
+    env CFLAGS="-O2 -fPIC" pyenv install -s  $BEST_AVAILABLE_PYTHON_VERSION
+    pyenv global $BEST_AVAILABLE_PYTHON_VERSION
   ;;
 
   linux)
@@ -26,6 +27,6 @@ case $TRAVIS_OS_NAME in
     then
       pip install --user codecov
     fi
-    ;;
+  ;;
   *) exit 1 ;;
 esac
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b5ef5ae83..b5601fa25 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,8 +35,8 @@ ENV QTDIR "/opt/qt56"
 ENV PATH "${QTDIR}/bin:/usr/lib/ccache:${PATH}"
 
 RUN apt install -y libssl-dev 
-RUN CFLAGS="-O2 -fPIC" pyenv install 3.5.6
 ENV PYENV_VERSION 3.5.6
+RUN CFLAGS="-O2 -fPIC" pyenv install -s $PYENV_VERSION
 
 RUN echo 'source /opt/qt56/bin/qt56-env.sh' >> /root/.bashrc
 RUN echo 'eval "$(pyenv init -)"' >> /root/.bashrc
diff --git a/tests/thirdparty/googletest b/tests/thirdparty/googletest
index 191f9336b..8fbf9d16a 160000
--- a/tests/thirdparty/googletest
+++ b/tests/thirdparty/googletest
@@ -1 +1 @@
-Subproject commit 191f9336bc9212b5f5410ab663176f685cafed2a
+Subproject commit 8fbf9d16a63a8b0cd629b24089f9470deef75120