summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2018-03-25 22:19:16 +0100
committerGitHub <noreply@github.com>2018-03-25 22:19:16 +0100
commit09a5dcce2c51d87d77244970d2c09bea3207da7a (patch)
treef835fc9823d80e43bdbb65023b2aed5718ee1627
parent56572177b4a4875794b846e6c3dcd1557baa5763 (diff)
parent83dbe2b97e2fdafbb84f3078f7f47343ec674246 (diff)
downloadxmr-stak-09a5dcce2c51d87d77244970d2c09bea3207da7a.zip
xmr-stak-09a5dcce2c51d87d77244970d2c09bea3207da7a.tar.gz
Merge pull request #1157 from psychocrypt/fix-travisMACOSX
reenable MACOSX travis tests
-rw-r--r--.travis.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 4d53d48..de5b45f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,16 +70,15 @@ matrix:
- CMAKE_C_COMPILER=gcc-7
- XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
-# - os: osx
-# compiler: gcc
-# env:
-# - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
+ - os: osx
+ compiler: gcc
+ env:
+ - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
before_install:
- . CI/checkPRBranch
- - if [ $TRAVIS_OS_NAME = osx ]; then
+ - if [ $TRAVIS_OS_NAME = osx ] ; then
brew update;
- brew tap homebrew/science;
fi
- export PATH=$CUDA_ROOT/bin:$PATH
OpenPOWER on IntegriCloud