Non Linux CI fixes (#844)
* Switch to memurai for Windows tests * Switch to macports from brew.
This commit is contained in:
parent
392de5d7f9
commit
08593db1f2
12
.travis.yml
12
.travis.yml
@ -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:
|
|||||||
- 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 '&&'
|
||||||
|
Loading…
Reference in New Issue
Block a user