use microsoft/setup-msbuild

NREL · May 9, 2024 · 4b94ab2 · 4b94ab2
1 parent 3f85d84
commit 4b94ab2
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,18 +57,14 @@ jobs:
   build-on-windows:
     runs-on: windows-latest
     steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
     - name: Set relative paths
       shell: bash
       run: | 
         WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3
         echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-        echo "next"
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild"
-        echo "next"
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current"
-        echo "next"
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
       
     - name: Install wxWidgets
       shell: bash
@@ -77,9 +73,7 @@ jobs:
         ls
         tar jxf wxWidgets-3.2.3.tar.bz2
         cd wxWidgets-3.2.3
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-        ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-        MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release
+        msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release
       
     - name: Setup cmake
       uses: jwlawson/actions-setup-cmake@v2