Use GX and MSBuild custom paths when not empty (#46)

jenkinsci · Feb 27, 2024 · 710a068 · 710a068
1 parent a5463ac
commit 710a068
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/genexus/server/GeneXusServerSCM.java b/src/main/java/org/jenkinsci/plugins/genexus/server/GeneXusServerSCM.java
@@ -186,12 +186,18 @@ private GeneXusInstallation getGeneXusInstallation(@CheckForNull FilePath worksp
     }
 
     private String getGxPath(@CheckForNull FilePath workspace, @CheckForNull EnvVars env, @NonNull TaskListener listener) {
+        // check for custom path first
+        String customPath = getGxCustomPath();
+        if (customPath != null && !customPath.isEmpty()) {
+            return customPath;
+        }
+
         GeneXusInstallation installation = getGeneXusInstallation(workspace, env, listener);
         if (installation != null) {
             return installation.getHome();
         }
 
-        return getGxCustomPath();
+        return "";
     }
 
     private String getMSBuildInstallationId(@CheckForNull FilePath workspace, @CheckForNull EnvVars env, @NonNull TaskListener listener) {
@@ -204,14 +210,20 @@ private String getMSBuildInstallationId(@CheckForNull FilePath workspace, @Check
     }
 
     private String getMsBuildPath(@CheckForNull FilePath workspace, @CheckForNull EnvVars env, @NonNull TaskListener listener) {
+        // check for custom path first
+        String customPath = getMsbuildCustomPath();
+        if (customPath != null && !customPath.isEmpty()) {
+            return customPath;
+        }
+
         String installationId = getMSBuildInstallationId(workspace, env, listener);
         Node node = workspaceToNode(workspace);
         MsBuildInstallation msbuildTool = MsBuildInstallationHelper.resolveInstallation(installationId, node, env, listener);
         if (msbuildTool != null) {
             return msbuildTool.getHome();
         }
 
-        return getMsbuildCustomPath();
+        return "";
     }
 
     @Exported