Skip to content

The Unified and Autonomous Development Platform

chore: Add Windows support for workspace task automation

Robin Shen331cb2136084
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java
index 2febe52303..8071eb5377 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java
@@ -44,4 +44,27 @@ public class PosixShell extends WorkspaceShell {
return new PosixFacility(shell);
}
+ @Override
+ public String decorateRunPromptCommand(String command, String prompt,
+ String successMarker, String failureMarker) {
+ return "(\n"
+ + "\texport TASK_PROMPT=" + quote(prompt) + "\n"
+ + command + "\n"
+ + ")\n"
+ + "if [ $? -eq 0 ]; then\n"
+ + "\t" + printMarker(successMarker) + "\n"
+ + "else\n"
+ + "\t" + printMarker(failureMarker) + "\n"
+ + "fi";
+ }
+
+ private String quote(String value) {
+ return "'" + value.replace("'", "'\"'\"'") + "'";
+ }
+
+ private String printMarker(String marker) {
+ var splitIndex = marker.lastIndexOf('_', marker.length() - 3) + 1;
+ return "printf '%s\\n' " + quote(marker.substring(0, splitIndex)) + quote(marker.substring(splitIndex));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java
index 95e38b9d67..8643b52ad7 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PowerShell.java
@@ -44,4 +44,28 @@ public class PowerShell extends WorkspaceShell {
return new PowerShellFacility(powershell);
}
+ @Override
+ public String decorateRunPromptCommand(String command, String prompt,
+ String successMarker, String failureMarker) {
+ return "$env:TASK_PROMPT = " + quote(prompt) + "\n"
+ + "& {\n"
+ + command + "\n"
+ + "}\n"
+ + "if ($?) {\n"
+ + "\t" + printMarker(successMarker) + "\n"
+ + "} else {\n"
+ + "\t" + printMarker(failureMarker) + "\n"
+ + "}";
+ }
+
+ private String quote(String value) {
+ return "'" + value.replace("'", "''") + "'";
+ }
+
+ private String printMarker(String marker) {
+ var splitIndex = marker.lastIndexOf('_', marker.length() - 3) + 1;
+ return "Write-Output (" + quote(marker.substring(0, splitIndex))
+ + " + " + quote(marker.substring(splitIndex)) + ")";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.java
index 60e8677798..befabd1977 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.java
@@ -29,4 +29,28 @@ public class WindowsBatchShell extends WorkspaceShell {
return new WindowsBatchFacility();
}
+ @Override
+ public String decorateRunPromptCommand(String command, String prompt,
+ String successMarker, String failureMarker) {
+ return "@setlocal DisableDelayedExpansion\n"
+ + "@set \"TASK_PROMPT=" + escape(prompt) + "\"\n"
+ + command + "\n"
+ + "@if errorlevel 1 (\n"
+ + "\t@" + printMarker(failureMarker) + "\n"
+ + ") else (\n"
+ + "\t@" + printMarker(successMarker) + "\n"
+ + ")";
+ }
+
+ private String escape(String value) {
+ return value.replace("^", "^^")
+ .replace("%", "%%")
+ .replace("\"", "^\"");
+ }
+
+ private String printMarker(String marker) {
+ var splitIndex = marker.lastIndexOf('_', marker.length() - 3) + 1;
+ return "echo " + marker.substring(0, splitIndex) + "^" + marker.substring(splitIndex);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WorkspaceShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WorkspaceShell.java
index 14e46c2cc0..11f96248bd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WorkspaceShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WorkspaceShell.java
@@ -27,6 +27,9 @@ public abstract class WorkspaceShell implements Serializable {
public abstract ShellFacility getFacility();
+ public abstract String decorateRunPromptCommand(String command, String prompt,
+ String successMarker, String failureMarker);
+
protected static List<InputSuggestion> suggestVariables(String matchWith) {
return SuggestionUtils.suggestWorkspaceVariables(matchWith);
}
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index 07863e65b4..ce67a846ae 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -1138,7 +1138,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
else
fullPrompt = prompt;
- var command = decorateRunPromptCommand(finalApplicableSpec.getTaskAutomation().getRunTaskCmd(), fullPrompt);
+ var command = finalApplicableSpec.getShell().decorateRunPromptCommand(
+ finalApplicableSpec.getTaskAutomation().getRunTaskCmd(), fullPrompt,
+ RUN_PROMPT_SUCCESS_MARKER, RUN_PROMPT_FAILURE_MARKER);
var buffer = new StringBuilder();
openShell(workspace, "Terminal", command, base64Data -> {
synchronized (buffer) {
@@ -1170,27 +1172,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
}
- private String decorateRunPromptCommand(String command, String prompt) {
- return "(\n"
- + "\texport TASK_PROMPT=" + shellQuote(prompt) + "\n"
- + command + "\n"
- + ")\n"
- + "if [ $? -eq 0 ]; then\n"
- + "\t" + shellPrintMarker(RUN_PROMPT_SUCCESS_MARKER) + "\n"
- + "else\n"
- + "\t" + shellPrintMarker(RUN_PROMPT_FAILURE_MARKER) + "\n"
- + "fi";
- }
-
- private String shellQuote(String value) {
- return "'" + value.replace("'", "'\"'\"'") + "'";
- }
-
- private String shellPrintMarker(String marker) {
- var splitIndex = marker.lastIndexOf('_', marker.length() - 3) + 1;
- return "printf '%s\\n' " + shellQuote(marker.substring(0, splitIndex)) + shellQuote(marker.substring(splitIndex));
- }
-
private ClusterTask<Void> newRunWorkspaceTask(WorkspaceContext context) {
return new ClusterTask<Void>() {