From 273d5d89b74afd2ad5cb88e7a14a6f0edf276fdb Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Tue, 8 Jan 2019 21:20:29 +0100 Subject: [PATCH] Fix shortcuts on mac; fix #3482 (#3491) * hopefully fix #3482 * Travis:uUse the most recent osx_image; use homebrew support in travis --- .travis.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b20c35a9..ba664c7c 100644 --- a/.travis.yml +++ b/.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