Skip to content

The Unified and Autonomous Development Platform

chore: Check tod version before running task command in workspace

Robin Shenb7d1938ce656
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 8071eb5377..47fe5837df 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
@@ -49,7 +49,9 @@ public class PosixShell extends WorkspaceShell {
String successMarker, String failureMarker) {
return "(\n"
+ "\texport TASK_PROMPT=" + quote(prompt) + "\n"
+ + "\t" + CHECK_TOD_VERSION_COMMAND + " && (\n"
+ command + "\n"
+ + "\t)\n"
+ ")\n"
+ "if [ $? -eq 0 ]; then\n"
+ "\t" + printMarker(successMarker) + "\n"
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 8643b52ad7..7787277c20 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
@@ -48,10 +48,13 @@ public class PowerShell extends WorkspaceShell {
public String decorateRunPromptCommand(String command, String prompt,
String successMarker, String failureMarker) {
return "$env:TASK_PROMPT = " + quote(prompt) + "\n"
- + "& {\n"
+ + "$taskSucceeded = $false\n"
+ + CHECK_TOD_VERSION_COMMAND + "\n"
+ + "if ($?) {\n"
+ command + "\n"
+ + "\t$taskSucceeded = $?\n"
+ "}\n"
- + "if ($?) {\n"
+ + "if ($taskSucceeded) {\n"
+ "\t" + printMarker(successMarker) + "\n"
+ "} else {\n"
+ "\t" + printMarker(failureMarker) + "\n"
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 befabd1977..86ecb360cd 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
@@ -34,7 +34,9 @@ public class WindowsBatchShell extends WorkspaceShell {
String successMarker, String failureMarker) {
return "@setlocal DisableDelayedExpansion\n"
+ "@set \"TASK_PROMPT=" + escape(prompt) + "\"\n"
+ + "@" + CHECK_TOD_VERSION_COMMAND + " && (\n"
+ command + "\n"
+ + ")\n"
+ "@if errorlevel 1 (\n"
+ "\t@" + printMarker(failureMarker) + "\n"
+ ") else (\n"
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 11f96248bd..ea0357bb5c 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
@@ -14,6 +14,8 @@ import io.onedev.server.web.util.SuggestionUtils;
public abstract class WorkspaceShell implements Serializable {
private static final long serialVersionUID = 1L;
+
+ protected static final String CHECK_TOD_VERSION_COMMAND = "tod check-version";
private String setupCommands;
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 ce8dd65259..0298252505 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
@@ -757,8 +757,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
} else {
throw new ExplicitException("""
No applicable provisioner discovered for current workspace. \
- Please add a shell provisioner in menu 'Administration / Workspace Provisioners' \
- with applicable projects configured properly""");
+ Please add a shell provisioner in menu 'Administration / Workspace Provisioners'""");
}
}
}
@@ -1159,7 +1158,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
delete(load(workspaceId));
} else if (buffer.indexOf(RUN_PROMPT_FAILURE_MARKER) != -1) {
commandCompleted.set(true);
- taskFailedCallback.onTaskFailed(workspaceReference);
+ sessionService.run(() -> {
+ taskFailedCallback.onTaskFailed(workspaceReference);
+ });
} else if (buffer.length() > 1024) {
buffer.delete(0, buffer.length() - 1024);
}
@@ -1167,7 +1168,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
});
return true;
} else if (workspace.getStatus() == Workspace.Status.INACTIVE) {
- taskFailedCallback.onTaskFailed(workspaceReference);
+ sessionService.run(() -> {
+ taskFailedCallback.onTaskFailed(workspaceReference);
+ });
return true;
} else {
return false;
diff --git a/server-core/src/main/java/io/onedev/server/workspace/TaskFailedCallback.java b/server-core/src/main/java/io/onedev/server/workspace/TaskFailedCallback.java
index 143e61c080..6578557d0f 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/TaskFailedCallback.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/TaskFailedCallback.java
@@ -4,6 +4,10 @@ import java.io.Serializable;
public interface TaskFailedCallback extends Serializable {
+ /**
+ * This method will be called in a Hibernate session
+ * @param workspaceReference
+ */
void onTaskFailed(String workspaceReference);
}
\ No newline at end of file