diff options
author | Michael Grunder <michael.grunder@gmail.com> | 2020-07-08 17:06:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-08 17:06:30 -0700 |
commit | 08593db1f2125b50a98cf20f6388579c34b90e76 (patch) | |
tree | a7bd70539a807916ae4b99621c325a7ba7c27a66 | |
parent | 392de5d7f97353485df1237872cb682842e8d83f (diff) |
Non Linux CI fixes (#844)
* Switch to memurai for Windows tests
* Switch to macports from brew.
-rw-r--r-- | .travis.yml | 12 |
1 files changed, 7 insertions, 5 deletions
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 '&&' |