From f6dfd5bda89ce0eda8d2fbb83114fcf39f77430c Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 12 Jul 2020 08:41:56 -0700
Subject: [PATCH] Travis: Use the default macOS image.

We don't need to try to build and cache bottles since brew still supports
this version with new binaries.
---
 .travis.sh  | 56 -----------------------------------------------------
 .travis.yml | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index eaa0e8eaf0..bdd4baa01c 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -21,64 +21,8 @@ download_extract_zip() {
     unzip $2 2>&1 | pv > /dev/null
 }
 
-brew_make_bottle() {
-    echo "Rebuilding $1 as bottle..."
-    brew uninstall -f --ignore-dependencies $1 && brew install --ignore-dependencies --build-bottle $1 || true
-    brew bottle $1 && brew postinstall $1 || true
-    rm $HOME/Library/Caches/Homebrew/$1-*.bottle.*.tar.gz || true
-    mv ./$1-*.bottle.*.tar.gz $HOME/Library/Caches/Homebrew/ || true
-}
-
 travis_before_install() {
     git submodule update --init --recursive
-
-    if [ "$TRAVIS_OS_NAME" = osx ]; then
-        # Depends on Python, wastes time updating...
-        brew uninstall -f mercurial || true
-
-        # To check version numbers, we want jq.  Try to cache this too.
-        for PKG in automake oniguruma; do
-            if ! brew info --json $PKG | grep built_as_bottle > /dev/null; then
-                if [ -f $HOME/Library/Caches/Homebrew/$PKG*.bottle.*.tar.gz ]; then
-                    brew install -f $HOME/Library/Caches/Homebrew/$PKG*.bottle.*.tar.gz || true
-                else
-                    brew_make_bottle $PKG
-                fi
-            fi
-        done
-        brew install jq || true
-
-        # Try to install as many at once as possible.
-        TO_UPGRADE=""
-        TO_UNINSTALL=""
-        for PKG in ccache openssl@1.1 pyenv pkg-config readline gdbm sqlite xz python sdl2; do
-            PKG_VER="`brew info $PKG --json | jq '.[0].versions.stable' | tr -d '"'`"
-            if [ -f $HOME/Library/Caches/Homebrew/$PKG--$PKG_VER*.bottle.*.tar.gz ]; then
-                TO_UPGRADE="$TO_UPGRADE $HOME/Library/Caches/Homebrew/$PKG--$PKG_VER*.bottle.*.tar.gz"
-                TO_UNINSTALL="$TO_UNINSTALL $PKG"
-            fi
-        done
-
-        for PKG in ccache openssl@1.1 pyenv pkg-config readline gdbm sqlite xz python sdl2; do
-            PKG_VER="`brew info $PKG --json | jq '.[0].versions.stable' | tr -d '"'`"
-            if [ ! -f $HOME/Library/Caches/Homebrew/$PKG--$PKG_VER*.bottle.*.tar.gz ]; then
-                brew_make_bottle $PKG
-            fi
-        done
-
-        if [ "$TO_UPGRADE" != "" ]; then
-            brew uninstall -f --ignore-dependencies $TO_UNINSTALL
-            brew install -f --ignore-dependencies $TO_UPGRADE || true
-        fi
-
-        # In case there were issues with all at once, now let's try installing any others from cache.
-        for PKG in ccache openssl@1.1 pyenv pkg-config readline gdbm sqlite xz python sdl2; do
-            PKG_VER="`brew info $PKG --json | jq '.[0].versions.stable' | tr -d '"'`"
-            if [ -f $HOME/Library/Caches/Homebrew/$PKG--$PKG_VER*.bottle.*.tar.gz ]; then
-                brew upgrade $HOME/Library/Caches/Homebrew/$PKG--$PKG_VER*.bottle.*.tar.gz || brew install -f $HOME/Library/Caches/Homebrew/$PKG-*.bottle.*.tar.gz || true
-            fi
-        done
-    fi
 }
 
 travis_install() {
diff --git a/.travis.yml b/.travis.yml
index b4b8105a4e..a9a454f062 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,10 @@ addons:
       - sourceline: 'ppa:ubuntu-sdk-team/ppa'
   homebrew:
     update: true
+    packages:
+      - ccache
+      - python
+      - sdl2
 
 cache:
   apt: true
@@ -85,6 +89,14 @@ jobs:
       compiler: "clang"
       env: PPSSPP_BUILD_TYPE=Linux
            LIBRETRO=TRUE
+    - os: osx
+      osx_image: xcode9.4
+      compiler: "clang"
+      env: PPSSPP_BUILD_TYPE=macOS
+    - os: osx
+      osx_image: xcode9.4
+      compiler: "clang"
+      env: PPSSPP_BUILD_TYPE=iOS
     - os: windows
       compiler: "msvc2017"
       env: PPSSPP_BUILD_TYPE=Windows
@@ -92,14 +104,6 @@ jobs:
       compiler: "msvc2017"
       env: PPSSPP_BUILD_TYPE=Windows
            UWP=TRUE
-#    - os: osx
-#      osx_image: xcode9
-#      compiler: "clang"
-#      env: PPSSPP_BUILD_TYPE=macOS
-#    - os: osx
-#      osx_image: xcode9
-#      compiler: "clang"
-#      env: PPSSPP_BUILD_TYPE=iOS
 
 before_install:
   - travis_retry bash .travis.sh travis_before_install