Use vswhere.exe in Windows pipeline

premake · Mar 29, 2022 · 3c0c0f5 · 3c0c0f5
1 parent d9b93c4
commit 3c0c0f5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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