From 669a2f8fc57ae5e2320e1bbca2d141e096fc758f Mon Sep 17 00:00:00 2001
From: ruben <rubenperez038@gmail.com>
Date: Sun, 5 Apr 2020 12:55:27 +0100
Subject: [PATCH] Debugging Travis OSX

---
 .travis.yml      | 52 ------------------------------------------------
 ci/build_unix.sh |  4 +++-
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0bb4521..d8d56b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,67 +41,15 @@ language: cpp
 
 matrix:
   include:
-    - name: linux_gcc_x64_debug_mysql
-      <<: *__linux_mysql_defaults
-      compiler: gcc
-      env:
-        - CMAKE_BUILD_TYPE=Debug
-    - name: linux_gcc_x64_release_mysql
-      <<: *__linux_mysql_defaults
-      compiler: gcc
-      env:
-        - CMAKE_BUILD_TYPE=Release
-    - name: linux_clang_x64_debug_mysql
-      <<: *__linux_mysql_defaults
-      compiler: clang
-      env:
-        - CMAKE_BUILD_TYPE=Debug
-    - name: linux_clang_x64_release_mysql
-      <<: *__linux_mysql_defaults
-      compiler: clang
-      env:
-        - CMAKE_BUILD_TYPE=Release
-    - name: linux_gcc_x64_debug_mariadb
-      <<: *__linux_mariadb_defaults
-      compiler: gcc
-      env:
-        - CMAKE_BUILD_TYPE=Debug
-    - name: linux_gcc_x64_release_mariadb
-      <<: *__linux_mariadb_defaults
-      compiler: gcc
-      env:
-        - CMAKE_BUILD_TYPE=Release
-    - name: linux_clang_x64_debug_mariadb
-      <<: *__linux_mariadb_defaults
-      compiler: clang
-      env:
-        - CMAKE_BUILD_TYPE=Debug
-    - name: linux_clang_x64_release_mariadb
-      <<: *__linux_mariadb_defaults
-      compiler: clang
-      env:
-        - CMAKE_BUILD_TYPE=Release
     - name: osx_clang_x64_debug_mysql
       <<: *__osx_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Debug
         - DATABASE=mysql
-    - name: osx_clang_x64_release_mysql
-      <<: *__osx_defaults
-      env:
-        - *__osx_cmake_options
-        - CMAKE_BUILD_TYPE=Release
-        - DATABASE=mysql
     - name: osx_clang_x64_debug_mariadb
       <<: *__osx_defaults
       env:
         - *__osx_cmake_options
         - CMAKE_BUILD_TYPE=Debug
         - DATABASE=mariadb
-    - name: osx_clang_x64_release_mariadb
-      <<: *__osx_defaults
-      env:
-        - *__osx_cmake_options
-        - CMAKE_BUILD_TYPE=Release
-        - DATABASE=mariadb
diff --git a/ci/build_unix.sh b/ci/build_unix.sh
index 4e7c6bf4..2e716dc2 100644
--- a/ci/build_unix.sh
+++ b/ci/build_unix.sh
@@ -3,10 +3,12 @@
 
 cp ci/*.pem /tmp # Copy SSL certs/keys to a known location
 if [ $TRAVIS_OS_NAME == "osx" ]; then
-	sudo cp ci/unix-ssl.cnf /etc/my.cnf  # In OSX, there is no default /etc/my.cnf
 	brew update
 	brew install $DATABASE
+	sudo cp ci/unix-ssl.cnf /etc/my.cnf  # In OSX, there is no default /etc/my.cnf
 	mysql.server start # Note that running this with sudo fails
+	cat /tmp/mysql-log.txt || echo "Could not open this log"
+	cat /usr/local/var/mysql/Traviss-Mac.local.err || echo "Could not open this log"
 	if [ $DATABASE == "mariadb" ]; then
 		sudo mysql -u root < ci/root_user_setup.sql
 	fi