* hopefully fix #3482 * Travis:uUse the most recent osx_image; use homebrew support in travis
This commit is contained in:
parent
b0e643ecc0
commit
273d5d89b7
1 changed files with 16 additions and 8 deletions
24
.travis.yml
24
.travis.yml
|
@ -84,24 +84,32 @@ matrix:
|
|||
- name: macOS (Debug)
|
||||
if: tag IS NOT present
|
||||
os: osx
|
||||
osx_image: xcode9.2
|
||||
env: HOMEBREW_NO_AUTO_UPDATE=1
|
||||
osx_image: xcode10.1
|
||||
cache: ccache
|
||||
before_install:
|
||||
- brew install ccache protobuf qt xz
|
||||
addons:
|
||||
homebrew:
|
||||
packages:
|
||||
- ccache
|
||||
- protobuf
|
||||
- qt
|
||||
- xz
|
||||
script: bash ./.ci/travis-compile.sh --server --install --debug
|
||||
|
||||
- name: macOS (Release)
|
||||
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
||||
os: osx
|
||||
osx_image: xcode9.2
|
||||
env: HOMEBREW_NO_AUTO_UPDATE=1
|
||||
cache: ccache
|
||||
before_install:
|
||||
- brew install ccache protobuf qt xz
|
||||
addons:
|
||||
homebrew:
|
||||
packages:
|
||||
- ccache
|
||||
- protobuf
|
||||
- qt
|
||||
- xz
|
||||
update: true
|
||||
script: bash ./.ci/travis-compile.sh --server --package "$TRAVIS_OS_NAME" --release
|
||||
|
||||
|
||||
# Builds for pull requests skip the deployment step altogether
|
||||
deploy:
|
||||
# Deploy configuration for "beta" releases
|
||||
|
|
Loading…
Reference in a new issue