VCI-237: Fix sonar.branch.target parameter passing (#34)

VirtoCommerce · Dec 17, 2021 · dbbb53c · dbbb53c
1 parent 6df86a0
commit dbbb53c
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/VirtoCommerce.Build/Build.cs b/src/VirtoCommerce.Build/Build.cs
@@ -898,17 +898,30 @@ private async Task<string> SendSwaggerSchemaToValidator(HttpClient httpClient, s
                         .SetPullRequestKey(SonarPRNumber ?? Environment.GetEnvironmentVariable("CHANGE_ID"))
                         .SetProcessArgumentConfigurator(args =>
                         {
-                            var result = args;
                             if (!string.IsNullOrEmpty(SonarPRProvider))
-                                result = result.Add($"/d:sonar.pullrequest.provider={SonarPRProvider}");
+                            {
+                                args = args.Add($"/d:sonar.pullrequest.provider={SonarPRProvider}");
+                            }
+
                             if (!string.IsNullOrEmpty(SonarGithubRepo))
-                                result = result.Add("/d:sonar.pullrequest.github.repository={value}", SonarGithubRepo);
-                            return result;
+                            {
+                                args = args.Add("/d:sonar.pullrequest.github.repository={value}", SonarGithubRepo);
+                            }
+
+                            return args;
                         }))
                     .When(!PullRequest, cc => cc
                         .SetBranchName(branchName)
-                        .When(_sonarLongLiveBranches.Contains(branchName), ccc => ccc
-                            .SetProcessArgumentConfigurator(args => args.Add($"/d:\"sonar.branch.target={branchNameTarget}\""))))
+                        .SetProcessArgumentConfigurator(args =>
+                        {
+                            if (_sonarLongLiveBranches.Contains(branchName))
+                            {
+                                args = args.Add($"/d:\"sonar.branch.target={branchNameTarget}\"");
+                            }
+
+                            return args;
+                        })
+                    )
                 );
             });