Fix 10

rnpgp · Sep 4, 2024 · 96fc3b3 · 96fc3b3
1 parent 3ec0d11
commit 96fc3b3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml
@@ -185,15 +185,11 @@ jobs:
  export PATH=${{ env.VCPKG_DIR_U }}/installed/${{ matrix.arch.triplet }}/bin:$PATH
  cmake --build build --parallel ${{ env.CORES }} --config Release
 
- - name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v2
-
- - name: Check vswhere
+ - name: Find visual studio root via vswhere
  shell: cmd
  run: |
- C:\ProgramData\Chocolatey\bin\vswhere.exe /? || echo "1 failed"
- C:\ProgramData\Chocolatey\bin\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x64.x64 -property installationPath || echo "2 failed"
- C:\ProgramData\Chocolatey\bin\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath || echo "3 failed"
+ FOR /F %%i in ('C:\ProgramData\Chocolatey\bin\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath') DO SET VS_PATH=%%i
+ echo "Detected Visual Studio path: %VS_PATH%"
  
  - name: Test
  shell: bash
@@ -202,7 +198,13 @@ jobs:
  # ctest --parallel ${{ env.CORES }} --test-dir build -R rnp_tests -C Debug --output-on-failure
  # ctest --parallel ${{ env.CORES }} --test-dir build -C Release --output-on-failure
  run: |
- echo "$PATH"
+ echo "VS_PATH: ${VS_PATH}"
+ #echo "$PATH"
+ vsp=$(cygpath -u "${VS_PATH}")
+ TOOLSET_VER=$(<"$vsp/VC/Auxiliary/Build/Microsoft.VCToolsVersion.${{matrix.toolset}}.default.txt")
+ echo "TOOLSET_VER: ${TOOLSET_VER}"
+ LIB_DIR="${vsp}/VC/Tools/MSVC/${TOOLSET_VER}/bin/Hostx64/x64"
+ echo "LIB_DIR: ${LIB_DIR}"
  # env
  ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise" || true
  ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC" || true