Update c-cpp.yml

oktonion · Sep 8, 2024 · 10b1970 · 10b1970
1 parent c2df4b6
commit 10b1970
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -130,16 +130,18 @@ jobs:
             BUILD_SCRIPT: ~build_tests.bat
             RUN_SCRIPT: run_tests.bat
             SETUP_SCRIPT: |
-              vswhere -latest
               set MSVS_VSVARS_PATH="C:\PROGRA~2\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+              if exist %MSVS_VSVARS_PATH% (
+              ) else (
+                vswhere -latest
+                set MSVS_VSVARS_PATH="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+              )
               echo %MSVS_VSVARS_PATH%
               if exist %MSVS_VSVARS_PATH% (
                 echo call %MSVS_VSVARS_PATH% > ~build_tests.bat
                 cat build_tests.bat >> ~build_tests.bat
               ) else (
                 echo "cannot find %MSVS_VSVARS_PATH%"
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" & dir
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\" & dir
                 exit /B 1
               )
 
@@ -153,16 +155,18 @@ jobs:
             RUN_SCRIPT: run_tests.bat
             SETUP_SCRIPT: |
               set MSVS_VSVARS_PATH="C:\PROGRA~2\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
-              vswhere -latest
+              if exist %MSVS_VSVARS_PATH% (
+              ) else (
+                vswhere -latest
+                set MSVS_VSVARS_PATH="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+              )
               echo %MSVS_VSVARS_PATH%
               if exist %MSVS_VSVARS_PATH% (
                 echo call %MSVS_VSVARS_PATH% > ~build_tests.bat
                 echo set CL_GLOBAL_DEFINES=-D TESTSUIT_USING_CPP98 >> ~build_tests.bat
                 cat build_tests.bat >> ~build_tests.bat
               ) else (
                 echo "cannot find %MSVS_VSVARS_PATH%"
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" & dir
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\" & dir
                 exit /B 1
               )
 
@@ -176,15 +180,17 @@ jobs:
             RUN_SCRIPT: run_tests.bat
             SETUP_SCRIPT: |
               set MSVS_VSVARS_PATH="C:\PROGRA~2\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-              vswhere -latest
+              if exist %MSVS_VSVARS_PATH% (
+              ) else (
+                vswhere -latest
+                set MSVS_VSVARS_PATH="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+              )
               echo %MSVS_VSVARS_PATH%
               if exist %MSVS_VSVARS_PATH% (
                 echo call %MSVS_VSVARS_PATH% > ~build_tests.bat
                 cat build_tests.bat >> ~build_tests.bat
               ) else (
                 echo "cannot find %MSVS_VSVARS_PATH%"
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" & dir
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\" & dir
                 exit /B 1
               )
 
@@ -198,16 +204,18 @@ jobs:
             RUN_SCRIPT: run_tests.bat
             SETUP_SCRIPT: |
               set MSVS_VSVARS_PATH="C:\PROGRA~2\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-              vswhere -latest
+              if exist %MSVS_VSVARS_PATH% (
+              ) else (
+                vswhere -latest
+                set MSVS_VSVARS_PATH="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+              )
               echo %MSVS_VSVARS_PATH%
               if exist %MSVS_VSVARS_PATH% (
                 echo call %MSVS_VSVARS_PATH% > ~build_tests.bat
                 echo set CL_GLOBAL_DEFINES=-D TESTSUIT_USING_CPP98 >> ~build_tests.bat
                 cat build_tests.bat >> ~build_tests.bat
               ) else (
                 echo "cannot find %MSVS_VSVARS_PATH%"
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" & dir
-                cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\" & dir
                 exit /B 1
               )