aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix shortcuts on mac; fix #3482 (#3491)

Browse source 
* hopefully fix #3482

* Travis:uUse the most recent osx_image; use homebrew support in travis
This commit is contained in:
ctrlaltca 2019-01-08 21:20:29 +01:00 committed by Zach H
parent b0e643ecc0
commit 273d5d89b7
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.travis.yml
View file

@ -84,24 +84,32 @@ matrix:
- name: macOS (Debug) - name: macOS (Debug)
if: tag IS NOT present if: tag IS NOT present
os: osx os: osx
osx_image: xcode9.2 osx_image: xcode10.1
env: HOMEBREW_NO_AUTO_UPDATE=1
cache: ccache cache: ccache
before_install: addons:
- brew install ccache protobuf qt xz homebrew:
packages:
- ccache
- protobuf
- qt
- xz
script: bash ./.ci/travis-compile.sh --server --install --debug script: bash ./.ci/travis-compile.sh --server --install --debug
- name: macOS (Release) - name: macOS (Release)
if: (branch = master AND NOT type = pull_request) OR tag IS present if: (branch = master AND NOT type = pull_request) OR tag IS present
os: osx os: osx
osx_image: xcode9.2 osx_image: xcode9.2
env: HOMEBREW_NO_AUTO_UPDATE=1
cache: ccache cache: ccache
before_install: addons:
- brew install ccache protobuf qt xz homebrew:
packages:
- ccache
- protobuf
- qt
- xz
update: true
script: bash ./.ci/travis-compile.sh --server --package "$TRAVIS_OS_NAME" --release script: bash ./.ci/travis-compile.sh --server --package "$TRAVIS_OS_NAME" --release
# Builds for pull requests skip the deployment step altogether # Builds for pull requests skip the deployment step altogether
deploy: deploy:
# Deploy configuration for "beta" releases # Deploy configuration for "beta" releases