diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-08 19:47:12 +0300 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-04-08 20:36:03 +0300 |
| commit | d43032f01fbaa55b1afd144c41e18d8fd3c46396 (patch) | |
| tree | b30a5986a384165da99d7bc5dac59b375610187f /.travis.yml | |
| parent | 95326274be5dacbf9a47906c46f46cc1f5275ed8 (diff) | |
| download | subsurface-d43032f01fbaa55b1afd144c41e18d8fd3c46396.tar.gz | |
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>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 27 |
1 files changed, 19 insertions, 8 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)?$/ |