Skip to content

Commit 404517e

Browse files
authored
Use windows-2022 for pip build
Signed-off-by: Grant Karapetyan <grant.karapetyan@meshinspector.com>
1 parent 7835213 commit 404517e

1 file changed

Lines changed: 5 additions & 12 deletions

File tree

.github/workflows/pip-build.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
update-documentation:
203203
# always() need to ignore general fail previous job, because this job depends on one matrix variant (aarch64 && py-version == 3.10),
204204
# and if this variant failed this job also will fail
205-
if: ${{ ( github.event_name == 'release' ) && always() }}
205+
if: ${{ ( github.event_name == 'release' || inputs.publish ) && always() }}
206206
needs:
207207
- manylinux-pip-build
208208
uses: ./.github/workflows/update-docs.yml
@@ -213,7 +213,7 @@ jobs:
213213
windows-pip-build:
214214
needs: setup
215215
timeout-minutes: 90
216-
runs-on: [self-hosted, windows, x64, vs-2019, meshinspector]
216+
runs-on: [windows-2022]
217217
strategy:
218218
fail-fast: false
219219
permissions:
@@ -258,35 +258,28 @@ jobs:
258258
run: scripts/mrbind-pybind11/install_all_python_versions_windows.bat
259259

260260
- name: Restore CUDA Cache
261-
# not needed for self-hosted vs2019 runner
262-
if: false
263261
uses: actions/cache@v4
264262
id: cuda-cache
265263
with:
266264
key: cuda-${{env.CUDA-VERSION}}
267265
path: C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA*
268266

269267
- name: Install CUDA
270-
# not needed for self-hosted vs2019 runner
271-
if: false && steps.cuda-cache.outputs.cache-hit != 'true'
268+
if: steps.cuda-cache.outputs.cache-hit != 'true'
272269
run: choco install cuda --version=${{env.CUDA-VERSION}} --confirm
273270

274271
- name: Setup CUDA
275-
# not needed for self-hosted vs2019 runner
276-
if: false
277272
run: |
278273
"CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v${{ env.CUDA-MAJOR }}.${{ env.CUDA-MINOR }}" >> $env:GITHUB_ENV
279274
"CUDA_PATH_V${{ env.CUDA-MAJOR }}_${{ env.CUDA-MINOR }}=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v${{ env.CUDA-MAJOR }}.${{ env.CUDA-MINOR }}" >> $env:GITHUB_ENV
280275
"CUDA_PATH_VX_Y=CUDA_PATH_V${{ env.CUDA-MAJOR }}_${{ env.CUDA-MINOR }}" >> $env:GITHUB_ENV
281276
"C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v${{ env.CUDA-MAJOR }}.${{ env.CUDA-MINOR }}\\bin" >> $env:GITHUB_PATH
282277
283278
- name: Install Visual Studio Integration
284-
# not needed for self-hosted vs2019 runner
285-
if: false
286279
run: |
287280
$x = (dir $env:CUDA_PATH -dir -recurse -depth 2).where({$_.name -eq 'visual_studio_integration'}).fullname
288281
$y = (dir $x -dir -recurse).where({$_.name -eq 'MSBuildExtensions'}).fullname + '\*'
289-
(gi 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_})
282+
(gi 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\*\BuildCustomizations').fullname.foreach({cp $y $_})
290283
291284
- name: Add msbuild to PATH
292285
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
@@ -321,7 +314,7 @@ jobs:
321314
env:
322315
MSYS2_DIR: C:\msys64_meshlib_mrbind\msys64
323316
run: |
324-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64
317+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64
325318
call ./scripts/mrbind/generate_win.bat -B --trace FOR_WHEEL=1
326319
327320
- name: Run Test

0 commit comments

Comments
 (0)