From 6cf950978f6bdff971289158fffc83e4536f3d7f Mon Sep 17 00:00:00 2001 From: Kyriet Date: Tue, 22 Feb 2022 18:38:21 +0100 Subject: [PATCH] Use vswhere.exe in Windows pipeline --- .github/workflows/ci-workflow.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index bdff7657af..5bbe28a989 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -46,7 +46,7 @@ jobs: name: premake-macosx-${{ matrix.platform }} path: bin/${{ matrix.config }}/ windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: config: [debug, release] @@ -56,9 +56,8 @@ jobs: uses: actions/checkout@v2 - name: Build run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - nmake -f Bootstrap.mak MSDEV=vs2019 windows-msbuild PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} - shell: cmd + $vcvarsall_path = vswhere.exe -find VC\Auxiliary\Build\vcvarsall.bat + cmd.exe /c "call ""$vcvarsall_path"" x86_amd64 && nmake -f Bootstrap.mak MSDEV=vs2019 windows-msbuild PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }}" - name: Test run: bin\${{ matrix.config }}\premake5 test --test-all shell: cmd