diff options
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | scripts/mac/before_install.sh | 10 |
2 files changed, 16 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index a0c48f767..ed67360fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,22 @@ 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 diff --git a/scripts/mac/before_install.sh b/scripts/mac/before_install.sh index f5afb81f1..fb7ba8b36 100644 --- a/scripts/mac/before_install.sh +++ b/scripts/mac/before_install.sh @@ -15,16 +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 |