From 08593db1f2125b50a98cf20f6388579c34b90e76 Mon Sep 17 00:00:00 2001 From: Michael Grunder Date: Wed, 8 Jul 2020 17:06:30 -0700 Subject: Non Linux CI fixes (#844) * Switch to memurai for Windows tests * Switch to macports from brew. --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 09246f9..8344c4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,12 @@ branches: - /^release\/.*$/ before_script: - - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis openssl; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then + curl -O https://distfiles.macports.org/MacPorts/MacPorts-2.6.2-10.13-HighSierra.pkg; + sudo installer -pkg MacPorts-2.6.2-10.13-HighSierra.pkg -target /; + export PATH=$PATH:/opt/local/bin && sudo port -v selfupdate; + sudo port -N install openssl redis; + fi; addons: apt: @@ -99,10 +104,7 @@ jobs: - eval "${MATRIX_EVAL}" install: - choco install ninja - - choco install redis-64 -y - before_script: - - redis-server --service-install --service-name Redis --port 6379 - - redis-server --service-start + - choco install -y memurai-developer script: - mkdir build && cd build - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&' -- cgit v1.2.3