Use env var for MSVC path

SonarSource · Jan 9, 2025 · 2589d6a · 2589d6a
1 parent bc8bbfd
commit 2589d6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.cirrus.yaml b/.cirrus.yaml
@@ -5,11 +5,12 @@ env:
   CIRRUS_SHELL: bash
   USERPROFILE: C:\sonar-ci # Fixes error MSB3073 and path too long issue with restored packages
   TMP_DIR: C:\sonar-ci\temp
+  MSVC: C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.40.33807\bin\Hostx64\x64\cl.exe
 
 ec2_instance_definition: &INSTANCE_DEFINITION
   region: eu-central-1
   type: c6i.xlarge
-  image: sonarlint-visualstudio-v*
+  image: pr-39-sonarlint-visualstudio-v20250107121045
   platform: windows
 
 calculate_version_script_definition: &CALCULATE_VERSION_SCRIPT_DEFINITION |

diff --git a/src/SLCore.IntegrationTests/SimpleAnalysisTests.cs b/src/SLCore.IntegrationTests/SimpleAnalysisTests.cs
@@ -69,7 +69,8 @@ public Task DefaultRuleConfig_ContentFromRpc_TypeScriptAnalysisProducesExpectedI
     [TestMethod]
     public Task DefaultRuleConfig_ContentFromDisk_CFamilyAnalysisProducesExpectedIssues()
     {
-        var compilerPath = @"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Tools\\MSVC\\14.42.34433\\bin\\Hostx64\\x64\\cl.exe";
+
+        var compilerPath = Environment.GetEnvironmentVariable("MSVC").Replace(@"\", @"\\");
         var cFamilyIssuesFileAbsolutePath = FileAnalysisTestsRunner.CFamilyIssues.GetFullPath().Replace(@"\", @"\\");
         var analysisDirectory = cFamilyIssuesFileAbsolutePath.Substring(0, cFamilyIssuesFileAbsolutePath.LastIndexOf('\\') + 1);
         var jsonContent = $$"""