Unverified Commit 08593db1 authored by Michael Grunder's avatar Michael Grunder Committed by GitHub
Browse files

Non Linux CI fixes (#844)

* Switch to memurai for Windows tests

* Switch to macports from brew.
parent 392de5d7
...@@ -15,7 +15,12 @@ branches: ...@@ -15,7 +15,12 @@ branches:
- /^release\/.*$/ - /^release\/.*$/
before_script: 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: addons:
apt: apt:
...@@ -99,10 +104,7 @@ jobs: ...@@ -99,10 +104,7 @@ jobs:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
install: install:
- choco install ninja - choco install ninja
- choco install redis-64 -y - choco install -y memurai-developer
before_script:
- redis-server --service-install --service-name Redis --port 6379
- redis-server --service-start
script: script:
- mkdir build && cd build - mkdir build && cd build
- cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&' - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment