Travis: update build options

This pulls the latest .travis.yml from master. Which among other things uses a
new tool chain for Mac. Which requires some changes to the Travis Mac build
script.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 19 insertions, 25 deletions

diff --git a/.travis.yml b/.travis.yml
index a0c48f767..ae7e7f568 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,26 @@ matrix:
 
     - env: SUBSURFACE_PLATFORM='mac'
       os: osx
-      osx_image: xcode8
-      language: c++ ruby
+      osx_image: xcode10.1
+      language: c++
+      addons:
+        homebrew:
+          packages:
+            - xz
+            - hidapi
+            - libusb
+            - libxml2
+            - libxslt
+            - libzip
+            - openssl
+            - pkg-config
+            - libgit2
+            - libssh2
+          update: true
 
     - env: SUBSURFACE_PLATFORM='windows'
       os: linux
       dist: trusty
-      sudo: required
       language: c++
 
     - env: SUBSURFACE_PLATFORM='windows-container'
@@ -28,7 +41,6 @@ matrix:
     - env: SUBSURFACE_PLATFORM='linux'
       os: linux
       dist: trusty
-      sudo: required
       language: c++
       addons:
         apt:
@@ -65,7 +77,6 @@ matrix:
     - env: SUBSURFACE_PLATFORM='linux2'
       os: linux
       dist: trusty
-      sudo: required
       language: c++
       addons:
         apt:
@@ -156,6 +167,6 @@ after_success:
     - source ${TRAVIS_BUILD_DIR}/scripts/${SUBSURFACE_PLATFORM}/after_success.sh
 
 branches:
-  except:
-    - # Do not build tags that we create when we upload to GitHub Releases
-    - /^(?i:continuous)/
+  only:
+    - master
+    - /^v\d+\.\d+(\.\d+)?(-branch)?$/
diff --git a/scripts/mac/before_install.sh b/scripts/mac/before_install.sh
index f5afb81f1..583c82daa 100644
--- a/scripts/mac/before_install.sh
+++ b/scripts/mac/before_install.sh
@@ -15,23 +15,6 @@ git fetch --unshallow
 git pull --tags
 git describe
 
-# for our build we need an updated Homebrew with a few more components
-# installed.
-#
-# in the past that was brutally slow, but now this is quite fast, so we
-# no longer bother with trying to cache the binaries - the raw download
-# takes longer than updating / installing from Homebrew
-brew update
-echo "Updated Homebrew, now get our dependencies brewed"
-brew install xz hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2
-
-# libdivecomputer uses the wrong include path for libusb and hidapi
-# the pkgconfig file for libusb/hidapi already gives the include path as
-# ../include/libusb-1.0 (../include/hidapi) yet libdivecomputer wants to use
-# include <libusb-1.0/libusb.h> and include <hidapi/hidapi.h>
-sudo ln -s /usr/local/include/libusb-1.0 /usr/local/include/libusb-1.0/libusb-1.0
-sudo ln -s /usr/local/include/hidapi /usr/local/include/libusb-1.0/hidapi
-
 # prep things so we can build for Mac
 # we have a custom built Qt some gives us just what we need, including QtWebKit
 #