Merge pull request #2625 from psychocrypt/rx-topic-updateTravis

[RX] update travis tests
fireice-uk · Dec 10, 2019 · 5048764 · 5048764
2 parents cd41b70 + 0b3e762
commit 5048764
Showing 1 changed file with 38 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,3 @@
-dist: trusty
-
-osx_image: xcode8.3
-
 sudo: false
 
 language: cpp
@@ -25,22 +21,24 @@ env:
 
 matrix:
   include:
-#    - os: linux
-#      compiler: gcc
-#      addons:
-#        apt:
-#          sources:
-#            - ubuntu-toolchain-r-test
-#          packages:
-#            - *default_packages
-#            - gcc-5
-#            - g++-5
-#      env:
-#        - CMAKE_CXX_COMPILER=g++-5
-#        - CMAKE_C_COMPILER=gcc-5
-#        - XMRSTAK_CMAKE_FLAGS="-DCUDA_ARCH=30 -DOpenCL_ENABLE=OFF"
-#
     - os: linux
+      dist: bionic
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - *default_packages
+            - gcc-5
+            - g++-5
+      env:
+        - CMAKE_CXX_COMPILER=g++-5
+        - CMAKE_C_COMPILER=gcc-5
+        - XMRSTAK_CMAKE_FLAGS="-DCUDA_ARCH=30 -DOpenCL_ENABLE=OFF"
+
+    - os: linux
+      dist: bionic
       compiler: gcc
       addons:
         apt:
@@ -57,6 +55,7 @@ matrix:
 
     # test with disabled HWLOC, MICROHTTPD, OpenSSL and no accelerators
     - os: linux
+      dist: bionic
       compiler: gcc
       addons:
         apt:
@@ -72,6 +71,7 @@ matrix:
         - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF -DHWLOC_ENABLE=OFF -DOpenSSL_ENABLE=OFF -DMICROHTTPD_ENABLE=OFF"
 
     - os: linux
+      dist: bionic
       compiler: gcc
       addons:
         apt:
@@ -85,8 +85,25 @@ matrix:
         - CMAKE_CXX_COMPILER=g++-7
         - CMAKE_C_COMPILER=gcc-7
         - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
+
+    - os: linux
+      dist: bionic
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - *default_packages
+            - gcc-8
+            - g++-8
+      env:
+        - CMAKE_CXX_COMPILER=g++-8
+        - CMAKE_C_COMPILER=gcc-8
+        - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
 
     - os: osx
+      osx_image: xcode8.3
       compiler: gcc
       env:
         - XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
@@ -109,7 +126,7 @@ install:
         travis_retry wget https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run &&
         ls -la &&
         chmod u+x *-run &&
-        ./cuda_9.0.176_384.81_linux-run --silent --toolkit --toolkitpath=$CUDA_ROOT &&
+        ./cuda_9.0.176_384.81_linux-run --silent --toolkit --override --toolkitpath=$CUDA_ROOT &&
         rm -rf ./cuda_9.0.176_384.81_linux-run $CUDA_ROOT/{samples,jre,doc,share} &&
         cd -;
       fi
@@ -120,6 +137,7 @@ script:
       brew install hwloc;
       cmake -DMICROHTTPD_ENABLE=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl ${XMRSTAK_CMAKE_FLAGS} .;
     else
+      export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$CUDA_ROOT;
       cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${XMRSTAK_CMAKE_FLAGS} .;
     fi;
   - make VERBOSE=1 install