Fix 9

rnpgp · Sep 4, 2024 · 3ec0d11 · 3ec0d11
1 parent 035615f
commit 3ec0d11
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml
@@ -194,6 +194,7 @@ jobs:
           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"
+          
       - name: Test
         shell: bash
         # Sometimes  running cli_tests in parallel causes instability [???]
@@ -203,19 +204,12 @@ jobs:
         run: |
           echo "$PATH"
           # env
-          ls -la "C:\\ProgramData\\Chocolatey\\bin\\"
-          C:\ProgramData\Chocolatey\bin\vswhere.exe --help || true
-          C:\ProgramData\Chocolatey\bin\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x64.x64 -property installationPath || true
-          # Find vswhere
-          vsw=$(cygpath -u "C:\ProgramData\Chocolatey\bin\vswhere.exe")
-          "C:\ProgramData\Chocolatey\bin\vswhere.exe -products * -requires Microsoft.Component.MSBuild -property installationPath -latest" || true
-          "$vsw -products * -requires Microsoft.Component.MSBuild -property installationPath -latest" || true
-          "$vsw -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath" || true
-          "$vsw --help" || true
-          "$vsw -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x64.x64 -property installationPath" || true
-          "vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x64.x64 -property installationPath" || true
-          ls -la "C:\\Program Files\\Microsoft Visual Studio\\" || true
-          ls -la "C:\\Program Files(x86)\\Microsoft Visual Studio\\" || true
+          ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise" || true
+          ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC" || true
+          ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\" || true
+          ls -la "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\" || true
+          cat "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.v142.default.txt" || true
+          cat "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.v143.default.txt" || true
           export PATH=${{ env.VCPKG_DIR_U }}/installed/${{ matrix.arch.triplet }}/bin:$PATH
           if [[ "${{ matrix.sanitizers }}" == "on" ]]; then
             echo "$PATH"