CI tweaks

.travis.yml

@@ -4,8 +4,6 @@ cache:
   directories:
     - ${HOME}/PawPawBuilds/debs
     - ${HOME}/PawPawBuilds/downloads
-    - ${HOME}/Library/Caches/Homebrew
-    - /usr/local/Homebrew
 
 env:
   global:
@@ -58,16 +56,10 @@ jobs:
     # macOS native build
     - name: "macOS native"
       os: osx
-      addons:
-        homebrew:
-          packages:
-            - cmake
-            - jq
-          update: true
+      osx_image: xcode9.4
       env:
         - TARGET="macos"
         - PLUGINS="${PLUGINS_BASE} ${PLUGINS_CROSS}"
-      osx_image: xcode9.4
 
 before_install:
   - bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh
@@ -79,9 +71,6 @@ script:
   - bash ${TRAVIS_BUILD_DIR}/bootstrap-plugins.sh ${TARGET}
   - bash ${TRAVIS_BUILD_DIR}/build-plugins.sh ${TARGET} ${PLUGINS}
 
-before_cache:
-  - bash ${TRAVIS_BUILD_DIR}/.travis/before_cache.sh
-
 before_deploy:
   - bash ${TRAVIS_BUILD_DIR}/pack-plugins.sh ${TARGET} ${PLUGINS}
 

.travis/before_cache.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing to do except for macOS native
-if [ "${TARGET}" != "macos" ]; then
-    exit 0
-fi
-
-brew cleanup
-find /usr/local/Homebrew \! -regex ".+\.git.+" -delete

.travis/install.sh

@@ -2,8 +2,9 @@
 
 set -e
 
-# nothing to do for macOS native
+# needed homebrew packages
 if [ "${TARGET}" = "macos" ]; then
+    HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake jq meson
     exit 0
 fi
 
@@ -37,10 +38,10 @@ elif [ "${TARGET}" = "macos-old" ]; then
     popd
 
 elif [ "${TARGET}" = "win32" ]; then
-    sudo apt-get install -y mingw-w64 binfmt-support binutils-mingw-w64-i686 g++-mingw-w64-i686 winehq-stable wine-binfmt
+    sudo apt-get install -y mingw-w64 binfmt-support binutils-mingw-w64-i686 g++-mingw-w64-i686 winehq-stable
 
 elif [ "${TARGET}" = "win64" ]; then
-    sudo apt-get install -y mingw-w64 binfmt-support binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 winehq-stable wine-binfmt
+    sudo apt-get install -y mingw-w64 binfmt-support binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 winehq-stable
 
 fi