The Unified and Autonomous Development Platform
Convert various default cispec projects into job suggestion projects.
Robin Shenf14fb099bfbc
diff --git a/server-core/src/main/java/io/onedev/server/ci/DefaultCISpecProvider.java b/server-core/src/main/java/io/onedev/server/ci/DefaultCISpecProvider.javadeleted file mode 100644index 1cf9f29073..0000000000--- a/server-core/src/main/java/io/onedev/server/ci/DefaultCISpecProvider.java+++ /dev/null@@ -1,48 +0,0 @@-package io.onedev.server.ci;--import javax.annotation.Nullable;--import org.eclipse.jgit.lib.ObjectId;--import io.onedev.commons.launcher.loader.ExtensionPoint;-import io.onedev.server.model.Project;--/**- * This extension point extends OneDev's ability to provide default CI spec for different- * kinds of projects- * <p>- * OneDev has built-in CI support to build projects. The build instructions are defined in <i>onedev-ci.xml</i>- * in root of the project (do not worry about writing this xml, OneDev has visual editor to help you doing- * that). For some typical projects, it is possible that some default build instructions can be deducted- * automatically without existence of <i>onedev-ci.xml</i>. Hence we introduced this extension point to make- * OneDev CI more easier to get started.- *- * @author robin- *- */-@ExtensionPoint-public interface DefaultCISpecProvider {-- int DEFAULT_PRIORITY = 100;-- /**- * Get default CI spec for specified project and commit- * @param project- * @param commitId- * @return- * default CI spec, or <tt>null</tt> if no default CI spec can be provided- */- @Nullable- CISpec getDefaultCISpec(Project project, ObjectId commitId);-- /**- * Get priority of this provider. If multiple providers can provide default CI specs for- * specified project and commit, the provider with higher priority will win- *- * @return- * a number indicating priority of the provider. The lower the value is, the- * higher the priority is- */- int getPriority();--}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.javaindex 2e730eb155..b1fb991037 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java@@ -24,7 +24,7 @@ public class CacheSpec implements Serializable {+ "Note: Type @ to insert variable, use \\ to escape normal occurrences of @ or \\")@Interpolative(variableSuggester="suggestVariables")@NotEmpty- @RegEx(interpolative=true, value="[a-zA-Z0-9\\-_]+", message="Can only contain alphanumeric, dash and underscore")+ @RegEx(interpolative=true, value="[a-zA-Z0-9\\-_\\.]+", message="Can only contain alphanumeric, dash, dot and underscore")public String getKey() {return key;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.javaindex 6e9ccdc704..4ea96403e1 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java@@ -36,7 +36,6 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;-import io.onedev.server.util.validation.annotation.GroupName;import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -96,7 +95,6 @@ public class Job implements Serializable, Validatable {private transient Map<String, ParamSpec> paramSpecMap;@Editable(order=100, description="Specify name of the job")- @GroupName@NotEmptypublic String getName() {return name;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.java b/server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.javanew file mode 100644index 0000000000..7a6a0b54f2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.java@@ -0,0 +1,15 @@+package io.onedev.server.ci.job;++import java.util.Collection;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.model.Project;++@ExtensionPoint+public interface JobSuggestion {++ Collection<Job> suggestJobs(Project project, ObjectId commitId);++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.java b/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.javanew file mode 100644index 0000000000..0e9ada8f16--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.java@@ -0,0 +1,14 @@+package io.onedev.server.ci.job;++import javax.annotation.Nullable;++import io.onedev.server.model.Build;++public interface NamedFunction {++ String getName();++ @Nullable+ String call(Build build);++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.javaindex a71d3964a7..725e8a9305 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java@@ -8,6 +8,7 @@ import java.util.Map.Entry;import java.util.function.Function;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.model.Build;@@ -22,6 +23,8 @@ public class VariableInterpolator implements Function<String, String> {public static final String SCRIPTS_PREFIX = "scripts.";+ public static final String FUNCTIONS_PREFIX = "functions.";+private final Build build;public VariableInterpolator(Build build) {@@ -61,6 +64,13 @@ public class VariableInterpolator implements Function<String, String> {Map<String, Object> context = new HashMap<>();context.put("build", build);return (String) GroovyUtils.evalScriptByName(scriptName, context);+ } else if (t.startsWith(FUNCTIONS_PREFIX)) {+ String functionName = t.substring(FUNCTIONS_PREFIX.length());+ for (NamedFunction function: OneDev.getExtensions(NamedFunction.class)) {+ if (function.getName().equals(functionName))+ return function.call(build);+ }+ throw new OneException("Unable to find function with name: " + functionName);} else {throw new OneException("Unrecognized interpolation variable: " + t);}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4 b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4index 7ea415c963..740d881caf 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4@@ -21,5 +21,5 @@ WS;Value- : '\'' ('\\'.|~['\\])+? '\''+ : '\'' ('\\'.|~['\\])*? '\'';diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.javaindex d2180f6fd4..aded69b2ff 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java@@ -6,6 +6,8 @@ import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;+import org.apache.commons.lang3.StringUtils;+import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.server.event.build.BuildUpdated;import io.onedev.server.model.Build;@@ -29,7 +31,11 @@ public class SetBuildVersion extends LogInstruction {@Transactional@Overridepublic void execute(Build build, Map<String, List<String>> params) {- build.setVersion(params.values().iterator().next().iterator().next());+ String version = params.values().iterator().next().iterator().next();+ if (StringUtils.isNotBlank(version))+ build.setVersion(version);+ else+ build.setVersion(null);listenerRegistry.post(new BuildUpdated(build));}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 40800f3069..31214f5024 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -74,7 +74,6 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;@@ -717,25 +716,16 @@ public class Project extends AbstractEntity {public CISpec getCISpec(ObjectId commitId) {if (ciSpecCache == null)ciSpecCache = new HashMap<>();- Optional<CISpec> ciSpecOpt = ciSpecCache.get(commitId);- if (ciSpecOpt == null) {+ Optional<CISpec> ciSpec = ciSpecCache.get(commitId);+ if (ciSpec == null) {Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE), false);- if (blob != null) {- ciSpecOpt = Optional.fromNullable(CISpec.parse(blob.getBytes()));- } else {- List<DefaultCISpecProvider> providers = new ArrayList<>(OneDev.getExtensions(DefaultCISpecProvider.class));- providers.sort(Comparator.comparing(DefaultCISpecProvider::getPriority));- CISpec ciSpec = null;- for (DefaultCISpecProvider provider: providers) {- ciSpec = provider.getDefaultCISpec(this, commitId);- if (ciSpec != null)- break;- }- ciSpecOpt = Optional.fromNullable(ciSpec);- }- ciSpecCache.put(commitId, ciSpecOpt);+ if (blob != null)+ ciSpec = Optional.fromNullable(CISpec.parse(blob.getBytes()));+ else+ ciSpec = Optional.absent();+ ciSpecCache.put(commitId, ciSpec);}- return ciSpecOpt.orNull();+ return ciSpec.orNull();}public List<String> getJobNames() {diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 0e8fb385f0..0fe1c847ef 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -57,7 +57,7 @@ public class GroovyUtils {public static Object evalScriptByName(String scriptName) {return evalScriptByName(scriptName, new HashMap<>());}-+public static Object evalScriptByName(String scriptName, Map<String, Object> variables) {for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get())) {diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.javaindex fe3a30691a..86875f9595 100644--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java@@ -50,10 +50,13 @@ public class Interpolative implements Serializable {public String interpolateWith(Function<String, String> interpolator) {StringBuilder builder = new StringBuilder();for (Segment segment: segments) {- if (segment.getType() == Type.LITERAL)+ if (segment.getType() == Type.LITERAL) {builder.append(segment.getContent());- else- builder.append(interpolator.apply(segment.getContent()));+ } else {+ String interpolated = interpolator.apply(segment.getContent());+ if (interpolated != null)+ builder.append(interpolated);+ }}return builder.toString();}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 295a6a9608..5f35392fd2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -47,6 +47,7 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {if (script.isAuthorized(ScriptIdentity.get()))choices.put(script.getName(), null);}+return choices;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex fa0ab6b67f..46ee700e24 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -1055,8 +1055,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridepublic Collection<String> getWebSocketObservables() {Collection<String> observables = super.getWebSocketObservables();- if (resolvedRevision != null)+ if (resolvedRevision != null) {observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));+ observables.add("commit-status:" + getProject().getId() + ":" + resolvedRevision.name());+ }if (state.requestId != null)observables.add(PullRequest.getWebSocketObservable(state.requestId));if (state.commentId != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 04ae0cf3ae..dbcfa267a6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -17,9 +17,12 @@</a><a title="Delete job" class="delete"><i class="fa fa-trash"></i></a></div></div>- <a wicket:id="add" class="add btn btn-success btn-block">- <i class="fa fa-plus"></i> Add Job- </a>+ <div class="add">+ <a wicket:id="create" class="create btn btn-success">+ <i class="fa fa-plus"></i> Add Job+ </a>+ <a wicket:id="suggestions" class="suggestions btn btn-success" title="Job suggestions"><i class="fa fa-magic"></i></a>+ </div></div><div class="contents"><div wicket:id="contents" class="content"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 5bf06d1046..699d4f84b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -1,6 +1,8 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;import javax.validation.ConstraintViolation;import javax.validation.Validator;@@ -28,15 +30,20 @@ import com.google.common.base.Charsets;import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.server.OneDev;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobAware;+import io.onedev.server.ci.job.JobSuggestion;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.MultilineLabel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;@@ -100,6 +107,27 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpereturn content;}+ private void addJob(AjaxRequestTarget target, Job job) {+ Component nav = newJobNav(job);+ String script = String.format("$('.ci-spec>.valid>.jobs>.body>.side>.navs').append(\"<div id='%s'></div>\");",+ nav.getMarkupId());+ target.prependJavaScript(script);+ target.add(nav);++ Component content = newJobContent(job);+ script = String.format("$('.ci-spec>.valid>.jobs>.body>.contents').append(\"<div id='%s'></div>\");",+ content.getMarkupId());+ target.prependJavaScript(script);+ target.add(content);++ script = String.format(""+ + "onedev.server.ciSpec.showJob(%d); "+ + "$('#%s .select').mouseup(onedev.server.ciSpec.selectJob);"+ + "$('#%s .delete').mouseup(onedev.server.ciSpec.deleteJob);",+ jobNavs.size() - 1, nav.getMarkupId(), nav.getMarkupId());+ target.appendJavaScript(script);+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -119,33 +147,59 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpecontent.add(jobNavs);content.add(jobContents);- content.add(new AjaxLink<Void>("add") {+ List<Job> suggestedJobs = new ArrayList<>();+ for (JobSuggestion suggestion: OneDev.getExtensions(JobSuggestion.class))+ suggestedJobs.addAll(suggestion.suggestJobs(context.getProject(), context.getCommit()));++ AjaxLink<Void> createLink = new AjaxLink<Void>("create") {@Overridepublic void onClick(AjaxRequestTarget target) {- Job job = new Job();+ addJob(target, new Job());+ }++ };+ if (suggestedJobs.isEmpty())+ createLink.add(AttributeAppender.append("class", "no-suggestions"));++ content.add(createLink);++ if (!suggestedJobs.isEmpty()) {+ content.add(new MenuLink("suggestions") {++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();+ for (Job job: suggestedJobs) {+ menuItems.add(new MenuItem() {- Component nav = newJobNav(job);- String script = String.format("$(\"#%s\").prev().append(\"<div id='%s'></div>\");",- getMarkupId(), nav.getMarkupId());- target.prependJavaScript(script);- target.add(nav);+ @Override+ public String getLabel() {+ return job.getName();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {- Component content = newJobContent(job);- script = String.format("$(\"#%s\").parent().next().append(\"<div id='%s'></div>\");",- getMarkupId(), content.getMarkupId());- target.prependJavaScript(script);- target.add(content);+ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();+ addJob(target, job);+ }++ };+ }++ });+ }+ return menuItems;+ }- script = String.format(""- + "onedev.server.ciSpec.showJob(%d); "- + "$('#%s .select').mouseup(onedev.server.ciSpec.selectJob);"- + "$('#%s .delete').mouseup(onedev.server.ciSpec.deleteJob);",- jobNavs.size() - 1, nav.getMarkupId(), nav.getMarkupId());- target.appendJavaScript(script);- }-- });+ });+ } else {+ content.add(new WebMarkupContainer("suggestions").setVisible(false));+ }content.add(new SortBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex b67abb21d8..8e90e16196 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -92,6 +92,25 @@padding: 8px 8px;display: block;}+.ci-spec>.valid>div>.body>.side .add {+ position: relative;+}+.ci-spec>.valid>div>.body>.side .create {+ display: block;+ margin-right: 38px;+ border-radius: 4px 0 0 4px;+}+.ci-spec>.valid>div>.body>.side .create.no-suggestions {+ margin-right: 0;+ border-radius: 4px;+}+.ci-spec>.valid>div>.body>.side .suggestions {+ position: absolute;+ right: 0;+ top: 0;+ border-radius: 0 4px 4px 0;+ border-left: none;+}.ci-spec>.valid>div>.body>.contents>.content {border-radius: 4px;border: 2px solid #666;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javaindex 0c91d2e295..1f1ed30cd7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java@@ -32,11 +32,13 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;+import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.ci.CISpec;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.util.userident.UserIdent;@@ -182,6 +184,8 @@ public class FolderViewPanel extends Panel {iconClass = "fa fa-ext fa-folder-submodule-o";else if (blobIdent.isSymbolLink())iconClass = "fa fa-ext fa-folder-symbol-link-o";+ else if (blobIdent.path.equals(CISpec.BLOB_PATH))+ iconClass = "fa fa-cog";elseiconClass = "fa fa-file-text-o";pathIcon.add(AttributeModifier.append("class", iconClass));@@ -206,8 +210,10 @@ public class FolderViewPanel extends Panel {};- if (context.getBlobIdent().path != null)+ if (context.getBlobIdent().path != null)pathLink.add(new Label("label", blobIdent.path.substring(context.getBlobIdent().path.length()+1)));+ else if (blobIdent.path.equals(CISpec.BLOB_PATH))+ pathLink.add(new Label("label", "<b>" + HtmlEscape.escapeHtml5(blobIdent.path) + "</b>").setEscapeModelStrings(false));elsepathLink.add(new Label("label", blobIdent.path));item.add(pathLink);diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex a97d7c7e91..3a8afa88ff 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -26,6 +26,7 @@ import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobVariable;+import io.onedev.server.ci.job.NamedFunction;import io.onedev.server.ci.job.VariableInterpolator;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;@@ -111,6 +112,12 @@ public class SuggestionUtils {if (!variables.containsKey(varName) && script.isAuthorized(ScriptIdentity.get()))variables.put(varName, null);}+ for (NamedFunction function: OneDev.getExtensions(NamedFunction.class)) {+ String varName = VariableInterpolator.FUNCTIONS_PREFIX + function.getName();+ if (!variables.containsKey(varName))+ variables.put(varName, null);+ }+for (Map.Entry<String, String> entry: variables.entrySet()) {int index = entry.getKey().toLowerCase().indexOf(matchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 7c3475033d..cc169a7ad1 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -18,13 +18,10 @@<modules><module>server-plugin-archetype</module><module>server-plugin-report-html</module>- <module>server-plugin-cispec-maven</module><module>server-plugin-executor-kubernetes</module><module>server-plugin-executor-docker</module>- <module>server-plugin-cispec-node</module>- <module>server-plugin-cispec-laravel</module>- <module>server-plugin-cispec-rubyonrails</module>- <module>server-plugin-cispec-django</module>+ <module>server-plugin-cispec-maven</module><module>server-plugin-cispec-gradle</module>+ <module>server-plugin-cispec-node</module></modules></project>diff --git a/server-plugin/server-plugin-cispec-django/pom.xml b/server-plugin/server-plugin-cispec-django/pom.xmldeleted file mode 100644index 2d56305bdd..0000000000--- a/server-plugin/server-plugin-cispec-django/pom.xml+++ /dev/null@@ -1,13 +0,0 @@-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">- <modelVersion>4.0.0</modelVersion>- <artifactId>server-plugin-cispec-django</artifactId>- <parent>- <groupId>io.onedev</groupId>- <artifactId>server-plugin</artifactId>- <version>3.0.1</version>- </parent>- <properties>- <moduleClass>org.server.plugin.cispec.django.DjangoModule</moduleClass>- </properties>-</project>diff --git a/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.java b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.javadeleted file mode 100644index 69765a04aa..0000000000--- a/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.java+++ /dev/null@@ -1,114 +0,0 @@-package org.server.plugin.cispec.django;--import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.collect.Lists;--import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {--- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {-- Blob manageBlob = project.getBlob(new BlobIdent(commitId.name(), "manage.py", FileMode.TYPE_FILE), false);-- Blob requirementBlob = project.getBlob(new BlobIdent(commitId.name(), "requirements.txt", FileMode.TYPE_FILE), false);-- if (manageBlob != null && requirementBlob != null ) {-- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- job.setImage("python:3.6");-- Blob projectVersionBlob = project.getBlob(new BlobIdent(commitId.name(), "setup.py", FileMode.TYPE_FILE), false);-- String version = null;-- if (projectVersionBlob != null) {-- version = getVersion(projectVersionBlob, "version");- //Django default version is "0.0.0"- if(version.isEmpty())- version = "0.0.0";-- job.setCommands(Lists.newArrayList(- "set -e",- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "python -m ensurepip",- "pip3 install -r requirements.txt",- "python manage.py test",- "python setup.py sdist"));- }else {- version = "0.0.0";-- job.setCommands(Lists.newArrayList(- "set -e",- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "python -m ensurepip",- "pip3 install -r requirements.txt",- "python manage.py test"));- }-- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- /*- * Cache Django local repository in order not to download Django dependencies all over again for- * subsequent builds- */- CacheSpec cache = new CacheSpec();- cache.setKey("python-local-repository");- cache.setPath("/usr/local/lib/python3.6/site-packages");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);-- return ciSpec;- }else {- return null;- }-- }-- private String getVersion(Blob blob,String containName) {- String projectVersion = null;- String blobString = blob.getText().getContent();- String[] blobStrings = blobString.split("\n");- for(String targetString : blobStrings) {- targetString = StringUtils.trim(targetString);- if(targetString.startsWith(containName)) {- projectVersion = StringUtils.substringAfter(targetString,"=");- projectVersion = StringUtils.strip(projectVersion.trim(),"'\",");- break;- }- }- if(projectVersion == null)- projectVersion = " ";- return projectVersion;- }--- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.java b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.javadeleted file mode 100644index 0a9152b2e7..0000000000--- a/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.java+++ /dev/null@@ -1,20 +0,0 @@-package org.server.plugin.cispec.django;--import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;--/**- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.- *- */-public class DjangoModule extends AbstractPluginModule {-- @Override- protected void configure() {- super.configure();-- // put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultDjangoCISpecProvider.class);- }--}diff --git a/server-plugin/server-plugin-cispec-gradle/pom.xml b/server-plugin/server-plugin-cispec-gradle/pom.xmlindex 3bfdc672ff..8bd1a4f989 100644--- a/server-plugin/server-plugin-cispec-gradle/pom.xml+++ b/server-plugin/server-plugin-cispec-gradle/pom.xml@@ -7,6 +7,13 @@<artifactId>server-plugin</artifactId><version>3.0.1</version></parent>+ <dependencies>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-report-html</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies><properties><moduleClass>org.server.plugin.cispec.gradle.GradleModule</moduleClass></properties>diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.javadeleted file mode 100644index 0544562388..0000000000--- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.java+++ /dev/null@@ -1,137 +0,0 @@-package org.server.plugin.cispec.gradle;--import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.collect.Lists;--import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultGradleCISpecProvider implements DefaultCISpecProvider {--- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {-- Blob gradleBlob = project.getBlob(new BlobIdent(commitId.name(), "build.gradle", FileMode.TYPE_FILE), false);- Blob kotlinBlob = project.getBlob(new BlobIdent(commitId.name(), "build.gradle.kts", FileMode.TYPE_FILE), false);- if (gradleBlob != null ) {- return getJob(project,commitId,gradleBlob);- }- if(kotlinBlob != null) {- return getJob(project,commitId,kotlinBlob);- }- return null;-- }-- private CISpec getJob(Project project, ObjectId commitId,Blob blob) {-- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- String version = null;-- String jdkVersion = null;-- Blob androidBlob = project.getBlob(new BlobIdent(commitId.name(), "app/build.gradle", FileMode.TYPE_FILE), false);-- if(androidBlob != null) {- version = getVersion(androidBlob, "versionName");- job.setImage("ekreative/android");- job.setCommands(Lists.newArrayList(- "set -e",- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "./gradlew test",- "./gradlew assembleDebug"));-- } else {- version = getVersion(blob, "version");- jdkVersion = getVersion(blob, "sourceCompatibility");- if(isValidInt(jdkVersion)) {- int jdkVersionInt=Integer.parseInt(jdkVersion);- if(jdkVersionInt>8)- {- job.setImage("gradle");- }- else- {- job.setImage("gradle:5.5.1-jdk8");- }-- }else {- job.setImage("gradle:5.5.1-jdk8");- }-- job.setCommands(Lists.newArrayList(- "set -e",- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "gradle clean",- "gradle build"));- }-- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- /*- * Cache Django local repository in order not to download Django dependencies all over again for- * subsequent builds- */- CacheSpec cache = new CacheSpec();- cache.setKey("android-local-repository");- cache.setPath("/root/.gradle");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);-- return ciSpec;-- }-- private String getVersion(Blob blob,String containName) {- String projectVersion = null;- String blobString = blob.getText().getContent();- String[] blobStrings = blobString.split("\n");- for(String targetString : blobStrings) {- targetString = StringUtils.trim(targetString);- if(targetString.startsWith(containName)) {- projectVersion = StringUtils.substringAfter(targetString,"=");- projectVersion = StringUtils.strip(projectVersion.trim(),"'\"");- break;- }- }- if(projectVersion == null)- projectVersion = " ";- return projectVersion;- }-- //判断字符串是否是整数- private boolean isValidInt(String value) {- try {- Integer.parseInt(value);- } catch (NumberFormatException e) {- return false;- }- return true;- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.javanew file mode 100644index 0000000000..0c5b97486e--- /dev/null+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java@@ -0,0 +1,131 @@+package org.server.plugin.cispec.gradle;++import java.util.ArrayList;+import java.util.Collection;++import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;++import com.google.common.collect.Lists;++import io.onedev.server.ci.job.CacheSpec;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;+import io.onedev.server.ci.job.trigger.PullRequestTrigger;+import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.plugin.report.html.JobHtmlReport;++public class GradleJobSuggestion implements JobSuggestion {++ public static final String DETERMINE_DOCKER_IMAGE = "gradle-determine-docker-image";++ public static final String DETERMINE_PROJECT_VERSION = "gradle-determine-project-version";++ @Override+ public Collection<Job> suggestJobs(Project project, ObjectId commitId) {+ Collection<Job> jobs = new ArrayList<>();++ Blob gradleBlob = getGradleBlob(project, commitId);+ Blob kotlinGradleBlob = getKotlinGradleBlob(project, commitId);++ if (gradleBlob != null || kotlinGradleBlob != null) {+ Job job = new Job();+ job.setName("gradle");+ job.setImage("@functions." + DETERMINE_DOCKER_IMAGE + "@");+ job.setCommands(Lists.newArrayList(+ "set -e",+ "echo \"Detecting project version (may require some time while downloading gradle dependencies)...\"",+ "buildVersion=$(gradle properties | grep ^version: | grep -v unspecified | cut -c10-)",+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",+ "gradle build"));+ setupTriggers(job);+ setupCaches(job);+ setupReports(job);+ jobs.add(job);+ }++ return jobs;+ }++ private static Blob getGradleBlob(Project project, ObjectId commitId) {+ return project.getBlob(new BlobIdent(commitId.name(), "build.gradle", FileMode.TYPE_FILE), false);+ }++ private static Blob getKotlinGradleBlob(Project project, ObjectId commitId) {+ return project.getBlob(new BlobIdent(commitId.name(), "build.gradle.kts", FileMode.TYPE_FILE), false);+ }++ private static Blob getGradlePropertiesBlob(Project project, ObjectId commitId) {+ return project.getBlob(new BlobIdent(commitId.name(), "gradle.properties", FileMode.TYPE_FILE), false);+ }++ private void setupTriggers(Job job) {+ job.getTriggers().add(new BranchUpdateTrigger());+ job.getTriggers().add(new PullRequestTrigger());+ }++ private void setupCaches(Job job) {+ CacheSpec cache = new CacheSpec();+ cache.setKey("gradle-cache");+ cache.setPath("/home/gradle/.gradle");+ job.getCaches().add(cache);+ }++ private void setupReports(Job job) {+ JobHtmlReport testReport = new JobHtmlReport();+ testReport.setFilePatterns("build/reports/tests/test/**");+ testReport.setReportName("Unit Test");+ testReport.setStartPage("build/reports/tests/test/index.html");+ job.getReports().add(testReport);+ }++ @Nullable+ private static String getJdkVersion(Blob blob) {+ for(String line: blob.getText().getContent().split("\n")) {+ line = line.toLowerCase().trim();+ if (line.contains("sourcecompatibility") && line.contains("=")) {+ String jdkVersion = StringUtils.substringAfter(line, "=").trim();+ jdkVersion = StringUtils.strip(jdkVersion, "'\"").trim();+ if (jdkVersion.startsWith("JavaVersion.VERSION_"))+ jdkVersion = jdkVersion.substring("JavaVersion.VERSION_".length());;+ return jdkVersion;+ }+ }+ return null;+ }++ public static String determineDockerImage(Build build) {+ String jdkVersion = null;+ Blob blob = getGradlePropertiesBlob(build.getProject(), build.getCommitId());+ if (blob != null)+ jdkVersion = getJdkVersion(blob);+ if (jdkVersion == null) {+ blob = getGradleBlob(build.getProject(), build.getCommitId());+ if (blob != null)+ jdkVersion = getJdkVersion(blob);+ }+ if (jdkVersion == null) {+ blob = getKotlinGradleBlob(build.getProject(), build.getCommitId());+ if (blob != null)+ jdkVersion = getJdkVersion(blob);+ }+ if (jdkVersion != null) {+ try {+ if (Integer.parseInt(jdkVersion) > 8)+ return "gradle";+ } catch (NumberFormatException e) {+ }+ return "gradle:5.6.3-jdk8";+ } else {+ return "gradle";+ }+ }++}diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.javaindex 6c161a7f51..61dad0c3e1 100644--- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java@@ -1,7 +1,9 @@package org.server.plugin.cispec.gradle;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.NamedFunction;+import io.onedev.server.model.Build;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -14,7 +16,22 @@ public class GradleModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultGradleCISpecProvider.class);+ contribute(JobSuggestion.class, GradleJobSuggestion.class);++ contribute(NamedFunction.class, new NamedFunction() {++ @Override+ public String getName() {+ return GradleJobSuggestion.DETERMINE_DOCKER_IMAGE;+ }++ @Override+ public String call(Build build) {+ return GradleJobSuggestion.determineDockerImage(build);+ }++ });+}}diff --git a/server-plugin/server-plugin-cispec-laravel/Dockerfile b/server-plugin/server-plugin-cispec-laravel/Dockerfiledeleted file mode 100644index b128088ff1..0000000000--- a/server-plugin/server-plugin-cispec-laravel/Dockerfile+++ /dev/null@@ -1,10 +0,0 @@-FROM php:7.3-fpm--RUN apt-get update --fix-missing && apt-get install -y \- git wget zip unzip nodejs-RUN wget https://phar.phpunit.de/phpunit.phar \-&& chmod +x phpunit.phar \-&& mv phpunit.phar /usr/local/bin/phpunit-RUN wget https://getcomposer.org/composer.phar \-&& chmod +x composer.phar \-&& mv composer.phar /usr/local/bin/composerdiff --git a/server-plugin/server-plugin-cispec-laravel/pom.xml b/server-plugin/server-plugin-cispec-laravel/pom.xmldeleted file mode 100644index 535650d614..0000000000--- a/server-plugin/server-plugin-cispec-laravel/pom.xml+++ /dev/null@@ -1,13 +0,0 @@-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">- <modelVersion>4.0.0</modelVersion>- <artifactId>server-plugin-cispec-laravel</artifactId>- <parent>- <groupId>io.onedev</groupId>- <artifactId>server-plugin</artifactId>- <version>3.0.1</version>- </parent>- <properties>- <moduleClass>io.onedev.server.plugin.cispec.laravel.LaravelPluginModule</moduleClass>- </properties>-</project>diff --git a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.javadeleted file mode 100644index 46d4890eb9..0000000000--- a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java+++ /dev/null@@ -1,66 +0,0 @@-package io.onedev.server.plugin.cispec.laravel;--import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.collect.Lists;--import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultLaravelCISpecProvider implements DefaultCISpecProvider {-- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId){- Blob blob = project.getBlob(new BlobIdent(commitId.name(), "composer.json", FileMode.TYPE_FILE), false);-- if (blob != null) {- String content = null;-- content = blob.getText().getContent();-- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- job.setImage("1dev/cispec-php:7.3-laravel");-- if (content.indexOf("laravel/framework") != -1) {- job.setCommands(Lists.newArrayList(- "composer install",- "phpunit"));-- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- CacheSpec cache = new CacheSpec();- cache.setKey("vendor");- cache.setPath("vendor");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);-- return ciSpec;- }else {- return null;- }- } else {- return null;- }- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.java b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.javadeleted file mode 100644index e744723f35..0000000000--- a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.plugin.cispec.laravel;--import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;--/**- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.- *- */-public class LaravelPluginModule extends AbstractPluginModule {-- @Override- protected void configure() {- super.configure();-- // put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultLaravelCISpecProvider.class);- }--}diff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.javadeleted file mode 100644index 34d5282c87..0000000000--- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.java+++ /dev/null@@ -1,115 +0,0 @@-package io.onedev.server.plugin.cispec.maven;--import java.io.StringReader;--import org.dom4j.Document;-import org.dom4j.DocumentException;-import org.dom4j.Node;-import org.dom4j.io.SAXReader;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.collect.Lists;--import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultMavenCISpecProvider implements DefaultCISpecProvider {-- private static final Logger logger = LoggerFactory.getLogger(DefaultMavenCISpecProvider.class);-- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {- Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);-- if (blob != null) {- Document document;- try {- document = new SAXReader().read(new StringReader(blob.getText().getContent()));- } catch (DocumentException e) {- logger.debug("Error parsing pom.xml (project: {}, commit: {})",- project.getName(), commitId.getName(), e);- return null;- }-- String javaVersion = "1.8";-- // Use XPath with localname as POM project element may contain xmlns definition- Node node = document.selectSingleNode("//*[local-name()='maven.compiler.source']");- if (node != null) {- javaVersion = node.getText().trim();- } else {- node = document.selectSingleNode("//*[local-name()='artifactId' and text()='maven-compiler-plugin']");- if (node != null)- node = node.getParent().selectSingleNode(".//*[local-name()='source']");- if (node != null) {- javaVersion = node.getText().trim();- } else {- // detect java version from Spring initializer generated projects- node = document.selectSingleNode("//*[local-name()='java.version']");- if (node != null)- javaVersion = node.getText().trim();- }- }-- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- try {- if (Integer.parseInt(javaVersion) <= 8)- job.setImage("maven:3.6.1-jdk-8");- else- job.setImage("maven:latest");- } catch (NumberFormatException e) {- job.setImage("maven:3.6.1-jdk-8");- }-- /*- * Before running maven test, we extract version of the project and use LogInstruction to tell- * OneDev using extracted version for current build- */- job.setCommands(Lists.newArrayList(- "echo \"Detecting project version (may require some time while downloading maven dependencies)...\"",- "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "echo",- "mvn clean test"));-- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- /*- * Cache Maven local repository in order not to download Maven dependencies all over again for- * subsequent builds- */- CacheSpec cache = new CacheSpec();- cache.setKey("maven-local-repository");- cache.setPath("/root/.m2");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);-- return ciSpec;- } else {- return null;- }- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}\ No newline at end of filediff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.javanew file mode 100644index 0000000000..b92a3b0dd0--- /dev/null+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java@@ -0,0 +1,116 @@+package io.onedev.server.plugin.cispec.maven;++import java.io.StringReader;+import java.util.ArrayList;+import java.util.Collection;++import org.dom4j.Document;+import org.dom4j.DocumentException;+import org.dom4j.Node;+import org.dom4j.io.SAXReader;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.Lists;++import io.onedev.server.ci.job.CacheSpec;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;+import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;++public class MavenJobSuggestion implements JobSuggestion {++ private static final Logger logger = LoggerFactory.getLogger(MavenJobSuggestion.class);++ public static final String DETERMINE_DOCKER_IMAGE = "maven-determine-docker-image";++ @Override+ public Collection<Job> suggestJobs(Project project, ObjectId commitId) {+ Collection<Job> jobs = new ArrayList<>();++ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);+ if (blob != null) {+ Job job = new Job();+ job.setName("maven");++ job.setImage("@functions." + DETERMINE_DOCKER_IMAGE + "@");+ /*+ * Before running maven test, we extract version of the project and use LogInstruction to tell+ * OneDev using extracted version for current build+ */+ job.setCommands(Lists.newArrayList(+ "echo \"Detecting project version (may require some time while downloading maven dependencies)...\"",+ "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",+ "echo",+ "mvn clean test"));++ // Trigger the job automatically when there is a push to the branch+ BranchUpdateTrigger trigger = new BranchUpdateTrigger();+ job.getTriggers().add(trigger);++ /*+ * Cache Maven local repository in order not to download Maven dependencies all over again for+ * subsequent builds+ */+ CacheSpec cache = new CacheSpec();+ cache.setKey("maven-cache");+ cache.setPath("/root/.m2/repository");+ job.getCaches().add(cache);++ jobs.add(job);+ }+ return jobs;+ }++ public static String determineDockerImage(Build build) {+ Project project = build.getProject();+ ObjectId commitId = build.getCommitId();++ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);++ Document document;+ try {+ document = new SAXReader().read(new StringReader(blob.getText().getContent()));+ } catch (DocumentException e) {+ logger.debug("Error parsing pom.xml (project: {}, commit: {})",+ project.getName(), commitId.getName(), e);+ return null;+ }++ String javaVersion = "1.8";++ // Use XPath with localname as POM project element may contain xmlns definition+ Node node = document.selectSingleNode("//*[local-name()='maven.compiler.source']");+ if (node != null) {+ javaVersion = node.getText().trim();+ } else {+ node = document.selectSingleNode("//*[local-name()='artifactId' and text()='maven-compiler-plugin']");+ if (node != null)+ node = node.getParent().selectSingleNode(".//*[local-name()='source']");+ if (node != null) {+ javaVersion = node.getText().trim();+ } else {+ // detect java version from Spring initializer generated projects+ node = document.selectSingleNode("//*[local-name()='java.version']");+ if (node != null)+ javaVersion = node.getText().trim();+ }+ }++ try {+ if (Integer.parseInt(javaVersion) <= 8)+ return "maven:3.6.1-jdk-8";+ else+ return "maven:latest";+ } catch (NumberFormatException e) {+ return "maven:3.6.1-jdk-8";+ }+ }+}\ No newline at end of filediff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.javaindex 7ef7861dc0..7848bcbdad 100644--- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java@@ -1,7 +1,9 @@package io.onedev.server.plugin.cispec.maven;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.NamedFunction;+import io.onedev.server.model.Build;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -14,7 +16,21 @@ public class MavenModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultMavenCISpecProvider.class);+ contribute(JobSuggestion.class, MavenJobSuggestion.class);++ contribute(NamedFunction.class, new NamedFunction() {++ @Override+ public String getName() {+ return MavenJobSuggestion.DETERMINE_DOCKER_IMAGE;+ }++ @Override+ public String call(Build build) {+ return MavenJobSuggestion.determineDockerImage(build);+ }++ });}}diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.javadeleted file mode 100644index 7b09a9ee29..0000000000--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java+++ /dev/null@@ -1,253 +0,0 @@-package io.onedev.server.plugin.cispec.node;--import java.io.IOException;-import java.util.Iterator;-import java.util.List;--import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {-- private static final Logger logger = LoggerFactory.getLogger(DefaultNodeCISpecProvider.class);-- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {- Blob blob = project.getBlob(new BlobIdent(commitId.name(), "package.json", FileMode.TYPE_FILE), false);-- if (blob != null) {- String content = null;- String version = null;-- content = blob.getText().getContent();- ObjectMapper objectMapper = OneDev.getInstance(ObjectMapper.class);- JsonNode jsonNode;- try {- jsonNode = objectMapper.readTree(content);- } catch (IOException e) {- logger.error("Error parsing package.json", e);- return null;- }-- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- job.setImage("node:10.16-alpine");-- if (content.indexOf("angular/core") != -1) { // Recognize angular projects-- job.setImage("1dev/cispec-node:10.16-alpine-chrome");-- version = jsonNode.findValue("version").asText();-- List<String> commands = Lists.newArrayList(- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "echo",- "npm install",- "npm install @angular/cli");-- if (jsonNode.has("scripts")) {- JsonNode jsonScripts = jsonNode.get("scripts");- Iterator<String> iterator = jsonScripts.fieldNames();- int length = jsonScripts.size();- String[] valueArray = new String[length];- int valueIndex = 0;-- while (iterator.hasNext()) {- String key = (String) iterator.next();- if (key.indexOf("lint") != -1 || key.indexOf("build") != -1) {- String value = jsonScripts.findValue(key).asText();- valueArray[valueIndex] = value;- valueIndex++;- } else if (key.indexOf("test") != -1) {- String value = jsonScripts.findValue(key).asText();- valueArray[valueIndex] = value + " --watch=false --browsers=ChromeHeadless";- valueIndex++;- }- }-- if (valueArray[0] != null) {- for (int i = 0; i < valueIndex; i++) {- commands.add("npx " + valueArray[i]);- }- } else {- commands.addAll(Lists.newArrayList(- "npx ng lint",- "npx ng test --watch=false --browsers=ChromeHeadless",- "npx ng build"));- }- } else {- commands.addAll(Lists.newArrayList(- "npx ng lint",- "npx ng test --watch=false --browsers=ChromeHeadless",- "npx ng build"));- }-- job.setCommands(commands);-- } else if (content.indexOf("react") != -1) { // Recognize react projects-- version = jsonNode.findValue("version").asText();-- List<String> commands = Lists.newArrayList(- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "echo",- "npm install typescript",- "npm install",- "export CI=TRUE");-- if (jsonNode.has("scripts")) {- JsonNode jsonScripts = jsonNode.get("scripts");- Iterator<String> iterator = jsonScripts.fieldNames();- int length = jsonScripts.size();- String[] valueArray = new String[length];- int valueIndex = 0;-- while (iterator.hasNext()) {- String key = (String) iterator.next();- if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {- String value = jsonScripts.findValue(key).asText();- valueArray[valueIndex] = value;- valueIndex++;- }- }-- if (valueArray[0] != null) {- for (int i = 0; i < valueIndex; i++) {- commands.add("npx " + valueArray[i]);- }- } else {- commands.addAll(Lists.newArrayList(- "npx react-scripts test",- "npx react-scripts build"));- }- } else {- commands.addAll(Lists.newArrayList(- "npx react-scripts test",- "npx react-scripts build"));- }-- job.setCommands(commands);- } else if (content.indexOf("vue") != -1) { // Recognize vue projects- version = jsonNode.findValue("version").asText();-- List<String> commands = Lists.newArrayList(- "buildVersion=" + version,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "echo",- "npm install");-- if (jsonNode.has("scripts")) {- JsonNode jsonScripts = jsonNode.get("scripts");- Iterator<String> iterator = jsonScripts.fieldNames();- int length = jsonScripts.size();- String[] valueArray = new String[length];- int valueIndex = 0;-- while (iterator.hasNext()) {- String key = (String) iterator.next();- if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {- String value = jsonScripts.findValue(key).asText();- valueArray[valueIndex] = value;- valueIndex++;- }- }-- if (valueArray[0] != null) {- for (int i = 0; i < valueIndex; i++) {- commands.add("npx " + valueArray[i]);- }- } else {- commands.add("npx jest");- }- } else {- commands.add("npx jest");- }-- job.setCommands(commands);-- } else if (content.indexOf("express") != -1) { // Recognize express projects-- version = jsonNode.findValue("version").asText();-- String Commands = ""- + "buildVersion=" + version + " \n"- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"- + "echo\n"- + "npm install \n";-- if (jsonNode.has("scripts")) {- JsonNode jsonScripts = jsonNode.get("scripts");- Iterator<String> iterator = jsonScripts.fieldNames();- int length = jsonScripts.size();- String[] valueArray = new String[length];- int valueIndex = 0;-- while (iterator.hasNext()) {- String key = (String) iterator.next();- if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {- String value = jsonScripts.findValue(key).asText();- valueArray[valueIndex] = value;- valueIndex++;- }- }-- if (valueArray[0] != null) {- for (int i = 0; i < valueIndex; i++) {- Commands = Commands + "npx " + valueArray[i] + " \n";- }- } else {- Commands = Commands- + "npx mocha \n";- }- } else {- Commands = Commands- + "npx mocha \n";- }- } else {- return null;- }- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- CacheSpec cache = new CacheSpec();- cache.setKey("node_modules");- cache.setPath("node_modules");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);-- return ciSpec;- } else {- return null;- }- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.javanew file mode 100644index 0000000000..8af585301a--- /dev/null+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java@@ -0,0 +1,264 @@+package io.onedev.server.plugin.cispec.node;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;+import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;++public class NodeJobSuggestion implements JobSuggestion {++ private static final Logger logger = LoggerFactory.getLogger(NodeJobSuggestion.class);++ public static final String DETERMINE_PROJECT_VERSION = "node-determine-project-version";++ @Override+ public Collection<Job> suggestJobs(Project project, ObjectId commitId) {+ Collection<Job> jobs = new ArrayList<>();++ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "package.json", FileMode.TYPE_FILE), false);+ if (blob == null)+ return jobs;++ String content = blob.getText().getContent();+ ObjectMapper objectMapper = OneDev.getInstance(ObjectMapper.class);+ JsonNode jsonNode;+ try {+ jsonNode = objectMapper.readTree(content);+ } catch (IOException e) {+ logger.error("Error parsing package.json", e);+ return jobs;+ }++ if (content.indexOf("angular/core") != -1) { // Recognize angular projects+ Job job = new Job();+ job.setName("angular");+ job.setImage("1dev/cispec-node:10.16-alpine-chrome");++ List<String> commands = Lists.newArrayList(+ "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",+ "echo",+ "npm install",+ "npm install \\@angular/cli");++ if (jsonNode.has("scripts")) {+ JsonNode jsonScripts = jsonNode.get("scripts");+ Iterator<String> iterator = jsonScripts.fieldNames();+ int length = jsonScripts.size();+ String[] valueArray = new String[length];+ int valueIndex = 0;++ while (iterator.hasNext()) {+ String key = (String) iterator.next();+ if (key.indexOf("lint") != -1 || key.indexOf("build") != -1) {+ String value = jsonScripts.findValue(key).asText();+ valueArray[valueIndex] = value;+ valueIndex++;+ } else if (key.indexOf("test") != -1) {+ String value = jsonScripts.findValue(key).asText();+ valueArray[valueIndex] = value + " --watch=false --browsers=ChromeHeadless";+ valueIndex++;+ }+ }++ if (valueArray[0] != null) {+ for (int i = 0; i < valueIndex; i++)+ commands.add("npx " + valueArray[i]);+ } else {+ commands.addAll(Lists.newArrayList(+ "npx ng lint",+ "npx ng test --watch=false --browsers=ChromeHeadless",+ "npx ng build"));+ }+ } else {+ commands.addAll(Lists.newArrayList(+ "npx ng lint",+ "npx ng test --watch=false --browsers=ChromeHeadless",+ "npx ng build"));+ }++ job.setCommands(commands);+ setupTriggers(job);+ jobs.add(job);+ }++ if (content.indexOf("react") != -1) { // Recognize react projects+ Job job = new Job();+ job.setName("react");+ job.setImage("node:10.16-alpine");++ List<String> commands = Lists.newArrayList(+ "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",+ "echo",+ "npm install typescript",+ "npm install",+ "export CI=TRUE");++ if (jsonNode.has("scripts")) {+ JsonNode jsonScripts = jsonNode.get("scripts");+ Iterator<String> iterator = jsonScripts.fieldNames();+ int length = jsonScripts.size();+ String[] valueArray = new String[length];+ int valueIndex = 0;++ while (iterator.hasNext()) {+ String key = (String) iterator.next();+ if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {+ String value = jsonScripts.findValue(key).asText();+ valueArray[valueIndex] = value;+ valueIndex++;+ }+ }++ if (valueArray[0] != null) {+ for (int i = 0; i < valueIndex; i++) {+ commands.add("npx " + valueArray[i]);+ }+ } else {+ commands.addAll(Lists.newArrayList(+ "npx react-scripts test",+ "npx react-scripts build"));+ }+ } else {+ commands.addAll(Lists.newArrayList(+ "npx react-scripts test",+ "npx react-scripts build"));+ }++ job.setCommands(commands);+ setupTriggers(job);+ jobs.add(job);+ }++ if (content.indexOf("vue") != -1) { // Recognize vue projects+ Job job = new Job();+ job.setName("vue");+ job.setImage("node:10.16-alpine");++ List<String> commands = Lists.newArrayList(+ "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",+ "echo",+ "npm install");++ if (jsonNode.has("scripts")) {+ JsonNode jsonScripts = jsonNode.get("scripts");+ Iterator<String> iterator = jsonScripts.fieldNames();+ int length = jsonScripts.size();+ String[] valueArray = new String[length];+ int valueIndex = 0;++ while (iterator.hasNext()) {+ String key = (String) iterator.next();+ if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {+ String value = jsonScripts.findValue(key).asText();+ valueArray[valueIndex] = value;+ valueIndex++;+ }+ }++ if (valueArray[0] != null) {+ for (int i = 0; i < valueIndex; i++) {+ commands.add("npx " + valueArray[i]);+ }+ } else {+ commands.add("npx jest");+ }+ } else {+ commands.add("npx jest");+ }++ job.setCommands(commands);+ setupTriggers(job);+ jobs.add(job);+ }++ if (content.indexOf("express") != -1) { // Recognize express projects+ Job job = new Job();+ job.setName("express");+ job.setImage("node:10.16-alpine");++ List<String> commands = Lists.newArrayList(+ "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",+ "echo",+ "npm install");++ if (jsonNode.has("scripts")) {+ JsonNode jsonScripts = jsonNode.get("scripts");+ Iterator<String> iterator = jsonScripts.fieldNames();+ int length = jsonScripts.size();+ String[] valueArray = new String[length];+ int valueIndex = 0;++ while (iterator.hasNext()) {+ String key = (String) iterator.next();+ if (key.indexOf("lint") != -1 || key.indexOf("test") != -1 || key.indexOf("build") != -1) {+ String value = jsonScripts.findValue(key).asText();+ valueArray[valueIndex] = value;+ valueIndex++;+ }+ }++ if (valueArray[0] != null) {+ for (int i = 0; i < valueIndex; i++)+ commands.add("npx " + valueArray[i]);+ } else {+ commands.add("npx mocha");+ }+ } else {+ commands.add("npx mocha");+ }+ job.setCommands(commands);+ setupTriggers(job);+ jobs.add(job);+ }+ return jobs;+ }++ private void setupTriggers(Job job) {+ BranchUpdateTrigger trigger = new BranchUpdateTrigger();+ job.getTriggers().add(trigger);+ }++ @Nullable+ private static JsonNode getPackageJson(Project project, ObjectId commitId) {+ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "package.json", FileMode.TYPE_FILE), false);+ if (blob != null) {+ String content = blob.getText().getContent();+ ObjectMapper objectMapper = OneDev.getInstance(ObjectMapper.class);+ try {+ return objectMapper.readTree(content);+ } catch (IOException e) {+ logger.error("Error parsing package.json", e);+ }+ }+ return null;+ }++ public static String determineProjectVersion(Build build) {+ JsonNode jsonNode = getPackageJson(build.getProject(), build.getCommitId());+ if (jsonNode != null)+ return jsonNode.findValue("version").asText();+ else+ return null;+ }+}diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.javaindex d1857ed707..073a7ef894 100644--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java@@ -1,7 +1,9 @@package io.onedev.server.plugin.cispec.node;import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;+import io.onedev.server.ci.job.JobSuggestion;+import io.onedev.server.ci.job.NamedFunction;+import io.onedev.server.model.Build;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -14,7 +16,21 @@ public class NodePluginModule extends AbstractPluginModule {super.configure();// put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultNodeCISpecProvider.class);+ contribute(JobSuggestion.class, NodeJobSuggestion.class);++ contribute(NamedFunction.class, new NamedFunction() {++ @Override+ public String getName() {+ return NodeJobSuggestion.DETERMINE_PROJECT_VERSION;+ }++ @Override+ public String call(Build build) {+ return NodeJobSuggestion.determineProjectVersion(build);+ }++ });}}diff --git a/server-plugin/server-plugin-cispec-rubyonrails/pom.xml b/server-plugin/server-plugin-cispec-rubyonrails/pom.xmldeleted file mode 100644index fe2949fb36..0000000000--- a/server-plugin/server-plugin-cispec-rubyonrails/pom.xml+++ /dev/null@@ -1,13 +0,0 @@-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">- <modelVersion>4.0.0</modelVersion>- <artifactId>server-plugin-cispec-rubyonrails</artifactId>- <parent>- <groupId>io.onedev</groupId>- <artifactId>server-plugin</artifactId>- <version>3.0.1</version>- </parent>- <properties>- <moduleClass>org.server.plugin.cispec.rubyonrails.RORPluginModule</moduleClass>- </properties>-</project>diff --git a/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.java b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.javadeleted file mode 100644index 4addeb2e78..0000000000--- a/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.java+++ /dev/null@@ -1,127 +0,0 @@-package org.server.plugin.cispec.rubyonrails;--import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.collect.Lists;--import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultCISpecProvider;-import io.onedev.server.ci.job.CacheSpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.git.Blob;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.model.Project;--public class DefaultRORCISpecProvider implements DefaultCISpecProvider {--- @Override- public CISpec getDefaultCISpec(Project project, ObjectId commitId) {-- Blob gemFileLockBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile.lock", FileMode.TYPE_FILE),- false);- if (gemFileLockBlob != null) {-- return getCISpec(gemFileLockBlob, project, commitId);-- } else {- Blob gemFileBlob = project.getBlob(new BlobIdent(commitId.name(), "Gemfile", FileMode.TYPE_FILE), false);- if (gemFileBlob != null) {-- return getCISpec(gemFileBlob, project, commitId);-- }-- }- return null;- }-- private CISpec getCISpec(Blob blob, Project project, ObjectId commitId) {-- String version = blob.getText().getContent();-- if (version.contains("rails") || version.contains("ruby")) {- CISpec ciSpec = new CISpec();-- Job job = new Job();-- job.setName("ci");-- Blob rubyVersionBlob = project.getBlob(new BlobIdent(commitId.name(), ".ruby-version", FileMode.TYPE_FILE),- false);-- if (rubyVersionBlob != null) {-- String rubyVersion = rubyVersionBlob.getText().getContent();-- rubyVersion = StringUtils.trim(rubyVersion);-- rubyVersion = StringUtils.strip(rubyVersion, "ruby-: ");-- job.setImage("ruby:" + rubyVersion);-- } else {- job.setImage("ruby");- }- String projectVersion = null;-- Blob projectVersionBlob = project.getBlob(new BlobIdent(commitId.name(), "config/version.rb", FileMode.TYPE_FILE),- false);- if(projectVersionBlob != null) {-- String projectVersionBlobContext = projectVersionBlob.getText().getContent();-- String[] blobStrings = projectVersionBlobContext.split("\n");-- for(String targetString : blobStrings) {- targetString = StringUtils.trim(targetString);- if(targetString.startsWith("VERSION")) {- projectVersion = StringUtils.substringAfter(targetString,"=");- projectVersion = StringUtils.strip(projectVersion.trim(),"'\",");- break;- }- }-- }- if(projectVersion == null) {- job.setCommands(Lists.newArrayList(- "bundle install",- "rails test"));- } else {- job.setCommands(Lists.newArrayList(- "set -e",- "buildVersion=" + projectVersion,- "echo \"##onedev[SetBuildVersion '$buildVersion']\"",- "bundle install",- "rails test"));- }-- // Trigger the job automatically when there is a push to the branch- BranchUpdateTrigger trigger = new BranchUpdateTrigger();- job.getTriggers().add(trigger);-- /*- * Cache Gemfile local repository in order not to download rails dependencies- * all over again for subsequent builds- */- CacheSpec cache = new CacheSpec();- cache.setKey("bundle-local-repository");- cache.setPath("/usr/local/bundle");- job.getCaches().add(cache);-- ciSpec.getJobs().add(job);- return ciSpec;-- }- return null;- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.java b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.javadeleted file mode 100644index f5bb1dde7d..0000000000--- a/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.java+++ /dev/null@@ -1,20 +0,0 @@-package org.server.plugin.cispec.rubyonrails;--import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.server.ci.DefaultCISpecProvider;--/**- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.- *- */-public class RORPluginModule extends AbstractPluginModule {-- @Override- protected void configure() {- super.configure();-- // put your guice bindings here- contribute(DefaultCISpecProvider.class, DefaultRORCISpecProvider.class);- }--}diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 96ec53d9ce..34745bbbfa 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -180,7 +180,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}private File getCacheHome() {- return new File(Bootstrap.getSiteDir(), "job-cache");+ return new File(Bootstrap.getSiteDir(), "cache");}private String createNetwork(JobContext jobContext, JobLogger jobLogger) {@@ -469,7 +469,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V@Overridepublic Void call() {String network = createNetwork(jobContext, jobLogger);- jobLogger.log("Executing job with docker under network " + network + "...");+ jobLogger.log("Executing job (executor: docker, network: " + network + ", image: " + jobContext.getImage() + ")...");try {jobContext.notifyJobRunning();@@ -492,7 +492,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vlogin(jobLogger);for (JobService jobService: jobContext.getServices()) {- jobLogger.log("Starting service '" + jobService.getName() + "...");+ jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");startService(network, jobService, jobLogger);}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 90e6bfc9f3..0288cdd3ba 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -477,7 +477,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataprivate void startService(String namespace, JobContext jobContext, JobService jobService,@Nullable String imagePullSecretName, JobLogger jobLogger) {- jobLogger.log("Creating service pod...");+ jobLogger.log("Creating service pod from image " + jobService.getImage() + "...");List<NodeSelectorEntry> nodeSelector = getNodeSelector();for (ServiceLocator locator: getServiceLocators()) {@@ -658,13 +658,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}).checkReturnCode();String namespace = createNamespace(jobContext, jobLogger);- jobLogger.log("Executing job with kubernetes under namespace " + namespace + "...");+ jobLogger.log("Executing job (executor: kubernetes, namespace: " + namespace + ", image: " + dockerImage + ")...");try {String imagePullSecretName = createImagePullSecret(namespace, jobLogger);if (jobContext != null) {for (JobService jobService: jobContext.getServices()) {- jobLogger.log("Starting service '" + jobService.getName() + "'...");+ jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");startService(namespace, jobContext, jobService, imagePullSecretName, jobLogger);}}diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 134ba88f5f..ffe7f71e01 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -30,21 +30,6 @@<artifactId>server-plugin-cispec-node</artifactId><version>${project.version}</version></dependency>- <dependency>- <groupId>io.onedev</groupId>- <artifactId>server-plugin-cispec-laravel</artifactId>- <version>${project.version}</version>- </dependency>- <dependency>- <groupId>io.onedev</groupId>- <artifactId>server-plugin-cispec-rubyonrails</artifactId>- <version>${project.version}</version>- </dependency>- <dependency>- <groupId>io.onedev</groupId>- <artifactId>server-plugin-cispec-django</artifactId>- <version>${project.version}</version>- </dependency><dependency><groupId>io.onedev</groupId><artifactId>server-plugin-cispec-gradle</artifactId>