The Unified and Autonomous Development Platform
chore: Split DefaultShellFacility into WindowsBatch and PosixShell
Robin Shen8c5d67f730d7
diff --git a/pom.xml b/pom.xmlindex c0bb5799d7..da538a27ff 100644--- a/pom.xml+++ b/pom.xml@@ -682,7 +682,7 @@</repositories><properties><commons.version>3.3.7</commons.version>- <agent.version>3.0.12</agent.version>+ <agent.version>3.0.13</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 92c1408a69..4adcaaeff9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -51,6 +51,7 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspec.step.Step;import io.onedev.server.buildspec.step.StepTemplate;import io.onedev.server.buildspec.step.UseTemplateStep;+import io.onedev.server.data.migration.ShellCommandDetector;import io.onedev.server.data.migration.VersionedYamlDoc;import io.onedev.server.data.migration.XmlBuildSpecMigrator;import io.onedev.server.job.JobAuthorizationContext;@@ -2669,4 +2670,59 @@ public class BuildSpec implements Serializable, Validatable {});}+ private static ScalarNode getScalarProperty(MappingNode node, String propertyName) {+ for (var tuple : node.getValue()) {+ if (((ScalarNode) tuple.getKeyNode()).getValue().equals(propertyName)+ && tuple.getValueNode() instanceof ScalarNode) {+ return (ScalarNode) tuple.getValueNode();+ }+ }+ return null;+ }++ @SuppressWarnings("unused")+ private void migrate50(VersionedYamlDoc doc, Stack<Integer> versions) {+ migrateSteps(doc, versions, stepsNode -> {+ for (var stepNodeItem : stepsNode.getValue()) {+ var stepNode = (MappingNode) stepNodeItem;+ if (!"CommandStep".equals(getStepType(stepNode)))+ continue;+ MappingNode interpreterNode = null;+ for (var tuple : stepNode.getValue()) {+ if (((ScalarNode) tuple.getKeyNode()).getValue().equals("interpreter")) {+ interpreterNode = (MappingNode) tuple.getValueNode();+ break;+ }+ }+ if (interpreterNode == null)+ continue;+ var typeNode = getScalarProperty(interpreterNode, "type");+ if (typeNode == null)+ continue;+ if (typeNode.getValue().equals("ShellInterpreter")) {+ typeNode.setValue("PosixInterpreter");+ } else if (typeNode.getValue().equals("DefaultInterpreter")) {+ boolean runInContainer = true;+ var runInContainerNode = getScalarProperty(stepNode, "runInContainer");+ if (runInContainerNode != null)+ runInContainer = Boolean.parseBoolean(runInContainerNode.getValue());+ var imageNode = getScalarProperty(stepNode, "image");+ boolean containerImageUsed = runInContainer+ && imageNode != null+ && StringUtils.isNotBlank(imageNode.getValue());+ var commandsNode = getScalarProperty(interpreterNode, "commands");+ boolean windowsBatch = !containerImageUsed+ && commandsNode != null+ && ShellCommandDetector.isWindowsBatch(commandsNode.getValue());+ typeNode.setValue(windowsBatch ? "WindowsBatchInterpreter" : "PosixInterpreter");+ if (!windowsBatch) {+ interpreterNode.getValue().add(new NodeTuple(+ new ScalarNode(Tag.STR, "shell"),+ new ScalarNode(Tag.STR, "sh")));+ }+ }+ }+ });+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.javaindex d2c2f99cc1..94763595c1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java@@ -30,7 +30,7 @@ import io.onedev.server.annotation.Path;import io.onedev.server.annotation.ReservedOptions;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.DockerAware;@@ -138,7 +138,7 @@ public class BuildImageWithKanikoStep extends CommandStep {@Overridepublic Interpreter getInterpreter() {- return new DefaultInterpreter();+ return new PosixInterpreter();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 6e8bb39262..020b9f006a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -22,7 +22,7 @@ import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.param.ParamCombination;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.DockerAware;@@ -42,7 +42,7 @@ public class CommandStep extends Step {private String image;- private Interpreter interpreter = new DefaultInterpreter();+ private Interpreter interpreter = new PosixInterpreter();private String runAs = "0:0";diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.javaindex 403c761f7c..ef3a092c35 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java@@ -19,7 +19,7 @@ import io.onedev.server.annotation.Interpolative;import io.onedev.server.annotation.Multiline;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.DockerAware;@@ -85,7 +85,7 @@ public abstract class CraneStep extends CommandStep {@Overridepublic Interpreter getInterpreter() {- return new DefaultInterpreter();+ return new PosixInterpreter();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.javaindex 1d1a66c5bf..91f483342b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java@@ -14,7 +14,7 @@ import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -118,7 +118,7 @@ public class SCPCommandStep extends CommandStep {@Overridepublic Interpreter getInterpreter() {- return new DefaultInterpreter() {+ return new PosixInterpreter() {@Overridepublic String getCommands() {var commandsBuilder = new StringBuilder();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.javaindex 37ffcf6cfe..c2351565e1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java@@ -15,7 +15,7 @@ import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -138,7 +138,7 @@ public class SSHCommandStep extends CommandStep {@Overridepublic Interpreter getInterpreter() {- return new DefaultInterpreter() {+ return new PosixInterpreter() {@Overridepublic String getCommands() {var commandsBuilder = new StringBuilder();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.javarename to server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.javaindex c09062e101..4a1c270106 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PosixInterpreter.java@@ -1,21 +1,21 @@package io.onedev.server.buildspec.step.commandinterpreter;+import javax.validation.constraints.NotEmpty;+import io.onedev.k8shelper.InterpreterFacade;-import io.onedev.k8shelper.ShellFacade;+import io.onedev.k8shelper.PosixInterpreterFacade;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-import javax.validation.constraints.NotEmpty;--@Editable(order=200, name="Custom Linux Shell")-public class ShellInterpreter extends Interpreter {+@Editable(order=100, name="POSIX Compatible Shell")+public class PosixInterpreter extends Interpreter {private static final long serialVersionUID = 1L;-- private String shell = "bash";- @Editable(order=100, name="Shell Executable", description="Specify shell executable to be used")+ private String shell = "sh";++ @Editable(order=100, name="Shell Executable", description="Specify POSIX shell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getShell() {@@ -40,10 +40,10 @@ public class ShellInterpreter extends Interpreter {public void setCommands(String commands) {super.setCommands(commands);}-+@Overridepublic InterpreterFacade getFacade() {- return new ShellFacade(getCommands(), getShell());+ return new PosixInterpreterFacade(getCommands(), getShell());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.javaindex 917cb0b32c..d29b7216c6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/PowerShellInterpreter.java@@ -1,7 +1,7 @@package io.onedev.server.buildspec.step.commandinterpreter;import io.onedev.k8shelper.InterpreterFacade;-import io.onedev.k8shelper.PowerShellFacade;+import io.onedev.k8shelper.PowerShellInterpreterFacade;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;@@ -47,7 +47,7 @@ public class PowerShellInterpreter extends Interpreter {@Overridepublic InterpreterFacade getFacade() {- return new PowerShellFacade(getCommands(), getPowershell());+ return new PowerShellInterpreterFacade(getCommands(), getPowershell());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.javarename to server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.javaindex e31f541887..a3ef67968b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/WindowsBatchInterpreter.java@@ -2,18 +2,18 @@ package io.onedev.server.buildspec.step.commandinterpreter;import javax.validation.constraints.NotEmpty;-import io.onedev.k8shelper.DefaultInterpreterFacade;import io.onedev.k8shelper.InterpreterFacade;+import io.onedev.k8shelper.WindowsBatchInterpreterFacade;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-@Editable(order=100, name="Default (Shell on Linux, Batch on Windows)")-public class DefaultInterpreter extends Interpreter {+@Editable(order=200, name="Windows Batch")+public class WindowsBatchInterpreter extends Interpreter {private static final long serialVersionUID = 1L;- @Editable(order=110, description="Specify shell commands (on Linux/Unix) or batch commands (on Windows) to execute "+ @Editable(order=100, description="Specify batch commands to execute "+ "under the <a href='https://docs.onedev.io/concepts#job-workdir' target='_blank'>job working directory</a>")@Interpolative@Code(language=Code.SHELL, variableProvider="suggestVariables")@@ -30,7 +30,7 @@ public class DefaultInterpreter extends Interpreter {@Overridepublic InterpreterFacade getFacade() {- return new DefaultInterpreterFacade(getCommands());+ return new WindowsBatchInterpreterFacade(getCommands());}-+}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex c5141c2c16..3ceeb64073 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8806,4 +8806,48 @@ public class DataMigrator {}}+ private static boolean isClass(Element element, String className) {+ return element.getName().equals(className)+ || className.equals(element.attributeValue("class"));+ }++ private static void setClass(Element element, String className) {+ if (element.attribute("class") != null)+ element.addAttribute("class", className);+ else+ element.setName(className);+ }++ private void migrate229(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element projectElement : dom.getRootElement().elements()) {+ var workspaceSpecsElement = projectElement.element("workspaceSpecs");+ if (workspaceSpecsElement != null) {+ for (Element workspaceSpecElement : workspaceSpecsElement.elements()) {+ var shellElement = workspaceSpecElement.element("shell");+ var defaultShellClass = "io.onedev.server.model.support.workspace.spec.shell.DefaultShell";+ var customLinuxShellClass = "io.onedev.server.model.support.workspace.spec.shell.CustomLinuxShell";+ var posixShellClass = "io.onedev.server.model.support.workspace.spec.shell.PosixShell";+ var windowsBatchShellClass = "io.onedev.server.model.support.workspace.spec.shell.WindowsBatchShell";+ if (isClass(shellElement, customLinuxShellClass)) {+ setClass(shellElement, posixShellClass);+ } else if (isClass(shellElement, defaultShellClass)) {+ boolean runInContainer = Boolean.parseBoolean(+ workspaceSpecElement.elementTextTrim("runInContainer"));+ boolean windowsBatch = !runInContainer+ && ShellCommandDetector.isWindowsBatch(shellElement.elementText("setupCommands"));+ setClass(shellElement, windowsBatch ? windowsBatchShellClass : posixShellClass);+ if (!windowsBatch)+ shellElement.addElement("shell").setText("sh");+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/ShellCommandDetector.java b/server-core/src/main/java/io/onedev/server/data/migration/ShellCommandDetector.javanew file mode 100644index 0000000000..1ebfee0f7b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/data/migration/ShellCommandDetector.java@@ -0,0 +1,26 @@+package io.onedev.server.data.migration;++import java.util.regex.Pattern;++import org.jspecify.annotations.Nullable;++public class ShellCommandDetector {++ private static final Pattern WINDOWS_BATCH_PATTERN = Pattern.compile(+ "(?im)(^\\s*(?:(?:@@|@)echo(?:\\s|$)|echo\\s+off\\b)"+ + "|^\\s*(?:call\\s+|goto\\s+|exit\\s+/b\\b|rem(?:\\s|$)|::)"+ + "|^\\s*if\\s+(?:not\\s+)?exist\\s+"+ + "|^\\s*for\\s+%%[a-z]\\s+in\\s*\\("+ + "|^\\s*set\\s+\"?[^\\s=\"]+="+ + "|%[a-z_][a-z0-9_]*%"+ + "|\\b(?:cmd(?:\\.exe)?\\s+/c|\\.bat\\b)"+ + "|\\b[a-z]:\\\\)");++ private ShellCommandDetector() {+ }++ public static boolean isWindowsBatch(@Nullable String commands) {+ return commands != null && WINDOWS_BATCH_PATTERN.matcher(commands).find();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.javaindex 911b8903ed..94d2ca5287 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java@@ -26,7 +26,7 @@ import io.onedev.server.annotation.Multiline;import io.onedev.server.annotation.SuggestionProvider;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;-import io.onedev.server.model.support.workspace.spec.shell.DefaultShell;+import io.onedev.server.model.support.workspace.spec.shell.PosixShell;import io.onedev.server.model.support.workspace.spec.shell.WorkspaceShell;import io.onedev.server.service.SettingService;import io.onedev.server.util.usage.Usage;@@ -57,7 +57,7 @@ public class WorkspaceSpec implements Serializable, Validatable {private String image;- private WorkspaceShell shell = new DefaultShell();+ private WorkspaceShell shell = new PosixShell();private List<EnvVar> envVars = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.javarename to server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.javaindex b6e17f43db..2febe52303 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/CustomLinuxShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/PosixShell.java@@ -2,20 +2,20 @@ package io.onedev.server.model.support.workspace.spec.shell;import javax.validation.constraints.NotEmpty;-import io.onedev.k8shelper.LinuxShellFacility;+import io.onedev.k8shelper.PosixFacility;import io.onedev.k8shelper.ShellFacility;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-@Editable(order=200, name="Custom Linux Shell")-public class CustomLinuxShell extends WorkspaceShell {+@Editable(order=100, name="POSIX Compatible Shell")+public class PosixShell extends WorkspaceShell {private static final long serialVersionUID = 1L;-- private String shell = "bash";- @Editable(order=100, name="Shell Executable", description="Specify shell executable to be used")+ private String shell = "sh";++ @Editable(order=100, name="Shell Executable", description="Specify POSIX shell executable to be used")@Interpolative(variableSuggester = "suggestVariables")@NotEmptypublic String getShell() {@@ -41,7 +41,7 @@ public class CustomLinuxShell extends WorkspaceShell {@Overridepublic ShellFacility getFacility() {- return new LinuxShellFacility(shell);+ return new PosixFacility(shell);}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/DefaultShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/DefaultShell.javarename to server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.javaindex b023f789b1..60e8677798 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/DefaultShell.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/shell/WindowsBatchShell.java@@ -1,13 +1,13 @@package io.onedev.server.model.support.workspace.spec.shell;-import io.onedev.k8shelper.DefaultShellFacility;import io.onedev.k8shelper.ShellFacility;+import io.onedev.k8shelper.WindowsBatchFacility;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-@Editable(order=100, name="Default (sh on Linux, batch on Windows)")-public class DefaultShell extends WorkspaceShell {+@Editable(order=200, name="Windows Batch")+public class WindowsBatchShell extends WorkspaceShell {private static final long serialVersionUID = 1L;@@ -26,7 +26,7 @@ public class DefaultShell extends WorkspaceShell {@Overridepublic ShellFacility getFacility() {- return new DefaultShellFacility();+ return new WindowsBatchFacility();}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.javaindex 7cb9289ffc..9250650a67 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java@@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.spec.ShortcutConfig;import io.onedev.server.model.support.workspace.spec.UserData;import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;-import io.onedev.server.model.support.workspace.spec.shell.CustomLinuxShell;+import io.onedev.server.model.support.workspace.spec.shell.PosixShell;import io.onedev.server.web.util.SuggestionUtils;@Editable(order=200, name="nt:Claude Code in Container", description="""@@ -23,7 +23,7 @@ public class ClaudeCodeInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);workspaceSpec.setImage("1dev/claudecode");- workspaceSpec.setShell(new CustomLinuxShell());+ workspaceSpec.setShell(new PosixShell());workspaceSpec.setRunAs("1001:1001");var shortcutConfig = new ShortcutConfig();diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.javaindex 25ba3c7612..5d73ce941e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java@@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.spec.ShortcutConfig;import io.onedev.server.model.support.workspace.spec.UserData;import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;-import io.onedev.server.model.support.workspace.spec.shell.CustomLinuxShell;+import io.onedev.server.model.support.workspace.spec.shell.PosixShell;import io.onedev.server.web.util.SuggestionUtils;@Editable(order=300, name="nt:Codex in Container", description="""@@ -23,7 +23,7 @@ public class CodexInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);workspaceSpec.setImage("1dev/codex");- workspaceSpec.setShell(new CustomLinuxShell());+ workspaceSpec.setShell(new PosixShell());workspaceSpec.setRunAs("1001:1001");var shortcutConfig = new ShortcutConfig();diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.javaindex 16cb736ffa..184b88986f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java@@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.spec.ShortcutConfig;import io.onedev.server.model.support.workspace.spec.UserData;import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;-import io.onedev.server.model.support.workspace.spec.shell.CustomLinuxShell;+import io.onedev.server.model.support.workspace.spec.shell.PosixShell;import io.onedev.server.web.util.SuggestionUtils;@Editable(order=400, name="nt:Cursor CLI in Container", description="""@@ -23,7 +23,7 @@ public class CursorInContainer extends WorkspaceSpecTemplate {workspaceSpec.setName(getName());workspaceSpec.setRunInContainer(true);workspaceSpec.setImage("1dev/cursor");- workspaceSpec.setShell(new CustomLinuxShell());+ workspaceSpec.setShell(new PosixShell());workspaceSpec.setRunAs("1001:1001");var shortcutConfig = new ShortcutConfig();diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.javaindex 205ccf3e31..cc8aaa5ccf 100644--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java@@ -7,7 +7,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.workspace.spec.ShortcutConfig;import io.onedev.server.model.support.workspace.spec.UserData;import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;-import io.onedev.server.model.support.workspace.spec.shell.CustomLinuxShell;+import io.onedev.server.model.support.workspace.spec.shell.PosixShell;import io.onedev.server.web.util.SuggestionUtils;@Editable(order=100, name="nt:Open Code in Container", description="""@@ -24,7 +24,7 @@ public class OpenCodeInContainer extends WorkspaceSpecTemplate {workspaceSpec.setRunInContainer(true);workspaceSpec.setImage("1dev/opencode");workspaceSpec.setRunAs("1001:1001");- workspaceSpec.setShell(new CustomLinuxShell());+ workspaceSpec.setShell(new PosixShell());var shortcutConfig = new ShortcutConfig();shortcutConfig.setName("OpenCode");diff --git a/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.java b/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.javanew file mode 100644index 0000000000..33ab60b7e8--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/data/migration/ShellCommandDetectorTest.java@@ -0,0 +1,26 @@+package io.onedev.server.data.migration;++import static org.junit.Assert.assertFalse;+import static org.junit.Assert.assertTrue;++import org.junit.Test;++public class ShellCommandDetectorTest {++ @Test+ public void shouldDetectWindowsBatchCommands() {+ assertTrue(ShellCommandDetector.isWindowsBatch("@echo off\r\nset VERSION=1\r\necho %VERSION%"));+ assertTrue(ShellCommandDetector.isWindowsBatch("@@echo off\r\nset VERSION=1"));+ assertTrue(ShellCommandDetector.isWindowsBatch("@@echo hello"));+ assertTrue(ShellCommandDetector.isWindowsBatch("if exist C:\\temp\\result.txt exit /b 1"));+ }++ @Test+ public void shouldDefaultToPosixCommands() {+ assertFalse(ShellCommandDetector.isWindowsBatch("set -e\nVERSION=1\necho \"$VERSION\""));+ assertFalse(ShellCommandDetector.isWindowsBatch("echo hello"));+ assertFalse(ShellCommandDetector.isWindowsBatch("mvn clean test"));+ assertFalse(ShellCommandDetector.isWindowsBatch(null));+ }++}diff --git a/server-ee b/server-eeindex fd9f8699c8..74e550bb02 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit fd9f8699c8e2359101abf50a28c1d3522107c436+Subproject commit 74e550bb0238998470c3706c7cdf90407e91895ddiff --git a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.javaindex 529abf03be..b176ffde6d 100644--- a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java+++ b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java@@ -28,7 +28,7 @@ import io.onedev.server.buildspec.step.CheckoutStep;import io.onedev.server.buildspec.step.CommandStep;import io.onedev.server.buildspec.step.SetBuildVersionStep;import io.onedev.server.buildspec.step.SetupCacheStep;-import io.onedev.server.buildspec.step.commandinterpreter.ShellInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;@@ -99,7 +99,7 @@ public class PythonJobSuggestion implements JobSuggestion {private CommandStep newPipBuildAndTestStep(String dependencyInstallCommand, boolean withPytest) {CommandStep buildAndTest = new CommandStep();- var interpreter = new ShellInterpreter();+ var interpreter = new PosixInterpreter();buildAndTest.setInterpreter(interpreter);buildAndTest.setName("build and test");buildAndTest.setImage("python");@@ -343,7 +343,7 @@ public class PythonJobSuggestion implements JobSuggestion {CommandStep buildAndTest = new CommandStep();buildAndTest.setName("build and test");buildAndTest.setImage("1dev/conda:1.0.4");- buildAndTest.setInterpreter(new ShellInterpreter());+ buildAndTest.setInterpreter(new PosixInterpreter());String commands = "" +"set -e\n" +"source /root/.bashrc\n" +diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.mdindex 57e62a064b..cc08665b0f 100644--- a/server-product/system/incompatibilities/incompatibilities.md+++ b/server-product/system/incompatibilities/incompatibilities.md@@ -1,3 +1,17 @@+# 16.0.0++### CI/CD++The `Default (Shell on Linux, Batch on Windows)` command interpreter of the CI/CD `Command` step has been removed. Use the explicit `POSIX Compatible Shell` or `Windows Batch` interpreter instead.++Existing build specs are migrated automatically. Commands running in a container are migrated to `POSIX Shell`. Commands running directly on an agent are inspected for Windows batch syntax; if the interpreter cannot be determined reliably, `POSIX Shell` is used. Review migrated host commands if they rely on Windows batch syntax that cannot be detected automatically.++### Workspace++The `Default (sh on Linux, batch on Windows)` workspace shell has been removed. Use the explicit `POSIX Compatible Shell` or `Windows Batch` workspace shell instead.++Existing workspace specs are migrated automatically. Workspaces using a container image are migrated to `POSIX Shell`. Other workspaces are inspected using their setup commands; if the shell cannot be determined reliably, `POSIX Shell` is used. Review migrated host workspace specs if their setup commands rely on Windows batch syntax that cannot be detected automatically.+# 15.1.0### CI/CD@@ -356,4 +370,4 @@ consideration. As a result of this, password authentication specified previously2. Project dependency authentication- You will need to define a job secret containing an access token in project build setting page, and then use that secret in project dependency definition. The access token should have permission to download dependency project artifacts of course.\ No newline at end of file+ You will need to define a job secret containing an access token in project build setting page, and then use that secret in project dependency definition. The access token should have permission to download dependency project artifacts of course.