Skip to content

Commit 4405399

Browse files
committed
CI Windows: use network installer instead of choco
Since it doesn't download/install everything, it is faster. (7:26 instead of 12:33 for whole Win job). + move some variables to strategy
1 parent f27884e commit 4405399

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

.github/workflows/ccpp.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,25 @@ jobs:
9898
name: run Windows
9999
needs: retag-continuous
100100
runs-on: windows-2019
101+
strategy:
102+
matrix:
103+
conf: [legacy]
104+
include:
105+
- conf: legacy
106+
cuda_arch: 30
107+
cuda_installer: cuda_10.2.89_win10_network.exe
101108

102109
steps:
103110
- uses: actions/checkout@main
104111
- name: install CUDA
105112
run: |
106-
choco install cuda -y --no-progress --version=10.1.243
107-
#$url="https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe"
108-
#$url -match 'cuda/(?<version>[0-9]+.[0-9]+)'
109-
#$version=$Matches.version
110-
#Invoke-WebRequest $url -OutFile cuda_inst.exe
111-
#Start-Process -FilePath "cuda_inst.exe" -ArgumentList "-s cudart_$version nvcc_$version visual_studio_integration_$version" -Wait -NoNewWindow
113+
#choco install cuda -y --no-progress --version=10.1.243
114+
$installer="${{ matrix.cuda_installer }}"
115+
$installer -match 'cuda_(?<version>[0-9]+.[0-9]+)'
116+
$version=$Matches.version # major.minor (without patch level)
117+
$url="https://developer.download.nvidia.com/compute/cuda/$version/Prod/network_installers/$installer"
118+
Invoke-WebRequest $url -OutFile cuda_inst.exe
119+
Start-Process -FilePath "cuda_inst.exe" -ArgumentList "-s cudart_$version nvcc_$version visual_studio_integration_$version" -Wait -NoNewWindow
112120
- name: install NSIS
113121
run: choco install nsis -y --no-progress
114122
- name: install GLFW
@@ -132,7 +140,7 @@ jobs:
132140
cmake.exe -DCMAKE_SYSTEM_VERSION=10.0.18362 -DCMAKE_BUILD_TYPE=Release `
133141
-DBUILD_OPENGL=ON -DGLFW_ROOT_DIR='C:\glfw' -DGLFW_USE_STATIC_LIBS=ON `
134142
-DGLEW_ROOT='C:\glew' -DGLEW_USE_STATIC_LIBS=ON `
135-
-DCMAKE_CUDA_ARCHITECTURES=30 -Bbuild .
143+
-DCMAKE_CUDA_ARCHITECTURES=${{ matrix.cuda_arch }} -Bbuild .
136144
cmake.exe --build build --config Release --parallel (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
137145
cmake.exe --install build --prefix GPUJPEG
138146
cpack.exe --config build/CPackConfig.cmake -GNSIS64

0 commit comments

Comments
 (0)