From 1514c2c529d3319976f82e48a9292be0297ffe9d Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Mon, 3 Jul 2023 11:49:58 +0200 Subject: [PATCH] COMP: Do not change location when launching VS development shell --- .github/workflows/build-test-cxx.yml | 4 ++-- .github/workflows/build-test-package-python.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-cxx.yml b/.github/workflows/build-test-cxx.yml index ecaada1..b27da1c 100644 --- a/.github/workflows/build-test-cxx.yml +++ b/.github/workflows/build-test-cxx.yml @@ -109,7 +109,7 @@ jobs: run: | Set-PSDebug -Trace 1 cd .. - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation mkdir ITK-build cd ITK-build @@ -192,5 +192,5 @@ jobs: if: matrix.os == 'windows-2022' shell: pwsh run: | - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }} diff --git a/.github/workflows/build-test-package-python.yml b/.github/workflows/build-test-package-python.yml index 35d1c25..c39e31a 100644 --- a/.github/workflows/build-test-package-python.yml +++ b/.github/workflows/build-test-package-python.yml @@ -236,7 +236,7 @@ jobs: if (Test-Path dist) { rm dist -r -fo } cd ../../im - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation $env:CC="cl.exe" $env:CXX="cl.exe" $env:ITK_PACKAGE_VERSION = "${{ inputs.itk-wheel-tag }}"