refactor(GitHub workflows - MSVC): find & setup Visual Studio 2022 Pr…

…eview
untrustedmodders · Feb 8, 2025 · 1cdafdf · 1cdafdf
1 parent 528666d
commit 1cdafdf
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -38,17 +38,16 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-    - name: Setup MSBuild (VS 2022 Preview)
-      uses: microsoft/setup-msbuild@v2
-      with:
-        msbuild-architecture: x64
-        vs-version: "[17.12,17.13)"  # Visual Studio 2022 (17)
-        vs-prerelease: true
+    - name: Find Visual Studio 2022 Preview
+      run: |
+        $vsPath = &"$env:ProgramFiles(x86)\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
+        echo "VSINSTALLDIR=$vsPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8
+      shell: pwsh
 
-    - name: Setup CMake
-      uses: jwlawson/actions-setup-cmake@v2
-      with:
-        cmake-version: '3.25.x'
+    - name: Setup Visual Studio 2022 Preview
+      run: |
+        call "${{ env.VSINSTALLDIR }}\VC\Auxiliary\Build\vcvarsall.bat" x64
+      shell: cmd
 
     - name: Configure CMake
       run: >