Skip to content

Commit bcbd88b

Browse files
authored
Merge pull request #2553 from psychocrypt/fix-ci_rx
[RX] fix CI
2 parents 90c8ebd + 5929d46 commit bcbd88b

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

.appveyor.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# image
2-
image: Visual Studio 2015
2+
image: Visual Studio 2017
33

44
# build platform
55
platform: x64
@@ -9,25 +9,26 @@ clone_folder: c:\xmr-stak
99

1010
install:
1111
- mkdir c:\xmr-stak-dep
12-
- curl -sL https://github.com/fireice-uk/xmr-stak-dep/releases/download/v1/xmr-stak-dep.zip -o xmr-stak-dep.zip
13-
- 7z x xmr-stak-dep.zip -o"c:\xmr-stak-dep" -y > nul
14-
- appveyor DownloadFile https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_windows-exe -FileName cuda_8.0.44_windows.exe
15-
- cuda_8.0.44_windows.exe -s compiler_8.0 cudart_8.0 nvrtc_8.0 nvrtc_dev_8.0
16-
- set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v8.0\bin;%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v8.0\libnvvp;%PATH%
12+
- curl -sL https://github.com/fireice-uk/xmr-stak-dep/releases/download/v2/xmr-stak-dep.zip -o xmr-stak-dep.zip
13+
- 7z x xmr-stak-dep.zip -o"c:\" -y > nul
14+
- dir c:\xmr-stak-dep
15+
- appveyor DownloadFile "https://developer.nvidia.com/compute/cuda/10.1/Prod/network_installers/cuda_10.1.105_win10_network.exe" -FileName install_cuda.exe
16+
- install_cuda.exe -s nvcc_10.1 cudart_10.1
17+
- set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin;%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\libnvvp;%PATH%
1718
- nvcc -V
1819

1920
build_script:
20-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsMSBuildCmd.bat"
21+
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.11
2122
- cd c:\xmr-stak
2223
- mkdir build
2324
- cd build
2425
- set CMAKE_PREFIX_PATH=C:\xmr-stak-dep\hwloc;C:\xmr-stak-dep\libmicrohttpd;C:\xmr-stak-dep\openssl;
25-
- cmake -G "Visual Studio 14 2015 Win64" -T v140,host=x64 .. -DCUDA_ARCH=30
26+
- cmake -G "Visual Studio 15 2017 Win64" -T v141,host=x64 .. -DCUDA_ARCH=35
2627
- cmake --build . --config Release --target install
2728

2829
test_script:
2930
- cd c:\xmr-stak\build\bin\Release
3031
- dir
3132
- copy C:\xmr-stak-dep\openssl\bin\* .
3233
- set XMRSTAK_NOWAIT=1
33-
- xmr-stak.exe --help --noUAC
34+
- xmr-stak-rx.exe --help --noUAC

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ language: cpp
99
cache:
1010
apt: true
1111
directories:
12-
- $HOME/.cache/cuda
12+
- $HOME/.cache/cuda9
1313

1414
addons:
1515
apt:
@@ -21,7 +21,7 @@ addons:
2121

2222
env:
2323
global:
24-
- CUDA_ROOT: $HOME/.cache/cuda
24+
- CUDA_ROOT: $HOME/.cache/cuda9
2525

2626
matrix:
2727
include:
@@ -106,11 +106,11 @@ install:
106106
if [ $NVCC_FOUND -ne 0 ]; then
107107
mkdir -p $CUDA_ROOT &&
108108
cd $CUDA_ROOT &&
109-
travis_retry wget https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run &&
109+
travis_retry wget https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run &&
110110
ls -la &&
111111
chmod u+x *-run &&
112-
./cuda_8.0.44_linux-run --silent --toolkit --toolkitpath=$CUDA_ROOT &&
113-
rm -rf ./cuda_8.0.44_linux-run $CUDA_ROOT/{samples,jre,doc,share} &&
112+
./cuda_9.0.176_384.81_linux-run --silent --toolkit --toolkitpath=$CUDA_ROOT &&
113+
rm -rf ./cuda_9.0.176_384.81_linux-run $CUDA_ROOT/{samples,jre,doc,share} &&
114114
cd -;
115115
fi
116116
fi;

0 commit comments

Comments
 (0)