Skip to content

The Unified and Autonomous Development Platform

Improve descriptions of various job triggers

Robin Shen572a07ca62e8
diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.java
index 778aad37ae..060c2554c6 100644
--- a/core/src/main/java/io/onedev/server/ci/Dependency.java
+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java
@@ -10,7 +10,7 @@ import io.onedev.server.ci.jobparam.JobParam;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
+import io.onedev.server.web.editable.annotation.PathPatterns;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies.DependencyEditPanel;
@Editable
@@ -22,7 +22,7 @@ public class Dependency implements Serializable {
private List<JobParam> params = new ArrayList<>();
- private String artifacts;
+ private String retrieveArtifacts;
@Editable(order=100)
@ChoiceProvider("getJobChoices")
@@ -45,15 +45,15 @@ public class Dependency implements Serializable {
this.params = params;
}
- @Editable(order=300, description="Optionally specify space-separated artifact paths to retrieve. Path is relative to "
- + "build artifacts directory. Use * or ? for wildcard match")
- @Multiline
- public String getArtifacts() {
- return artifacts;
+ @Editable(order=300, description="Optionally specify space-separated artifacts to retrieve into job workspace. "
+ + "Use * or ? for wildcard match")
+ @PathPatterns
+ public String getRetrieveArtifacts() {
+ return retrieveArtifacts;
}
- public void setArtifacts(String artifacts) {
- this.artifacts = artifacts;
+ public void setRetrieveArtifacts(String retrieveArtifacts) {
+ this.retrieveArtifacts = retrieveArtifacts;
}
@SuppressWarnings("unused")
diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.java
index f48385cc0a..8d6cc21657 100644
--- a/core/src/main/java/io/onedev/server/ci/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/Job.java
@@ -28,7 +28,7 @@ public class Job implements Serializable {
private List<JobTrigger> triggers = new ArrayList<>();
- private String artifacts;
+ private String publishArtifacts;
private long timeout = 3600;
@@ -71,8 +71,7 @@ public class Job implements Serializable {
this.dependencies = dependencies;
}
- @Editable(order=500, description="Use triggers to run the job automatically under certain conditions. "
- + "The condition will be checked in order and the first matching trigger will take effect")
+ @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")
public List<JobTrigger> getTriggers() {
return triggers;
}
@@ -81,15 +80,15 @@ public class Job implements Serializable {
this.triggers = triggers;
}
- @Editable(order=600, description="Optionally specify space-separated artifact paths to publish. "
- + "Artifact path is relative to job workspace. Use * or ? for wildcard match")
+ @Editable(order=600, description="Optionally specify space-separated workspace files to publish as artifacts. "
+ + "Use * or ? for wildcard match")
@PathPatterns
- public String getArtifacts() {
- return artifacts;
+ public String getPublishArtifacts() {
+ return publishArtifacts;
}
- public void setArtifacts(String artifacts) {
- this.artifacts = artifacts;
+ public void setPublishArtifacts(String publishArtifacts) {
+ this.publishArtifacts = publishArtifacts;
}
@Editable(order=600, description="Specify timeout in seconds")
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
index 3fe898b7ee..2cec930469 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
@@ -23,30 +23,30 @@ public class BranchPushedTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String branch;
+ private String branches;
- private String path;
+ private String paths;
- @Editable(order=100,
- description="Optionally specify branch to match. Wildcard character * and ? may be used")
+ @Editable(name="Pushed Branches", order=100,
+ description="Optionally specify space-separated branches to check. Use * or ? for wildcard match")
@BranchPatterns
- public String getBranch() {
- return branch;
+ public String getBranches() {
+ return branches;
}
- public void setBranch(String branch) {
- this.branch = branch;
+ public void setBranches(String branches) {
+ this.branches = branches;
}
- @Editable(name="File", order=200,
- description="Optionally specify file to match. Wildcard character * and ? may be used")
+ @Editable(name="Touched Files", order=200,
+ description="Optionally specify space-separated files to check. Use * or ? for wildcard match")
@PathPatterns("getPathSuggestions")
- public String getPath() {
- return path;
+ public String getPaths() {
+ return paths;
}
- public void setPath(String path) {
- this.path = path;
+ public void setPaths(String paths) {
+ this.paths = paths;
}
@SuppressWarnings("unused")
@@ -55,7 +55,7 @@ public class BranchPushedTrigger extends JobTrigger {
}
private boolean touchedFile(RefUpdated refUpdated) {
- if (getPath() != null) {
+ if (getPaths() != null) {
if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
return true;
} else if (refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
@@ -64,7 +64,7 @@ public class BranchPushedTrigger extends JobTrigger {
Collection<String> changedFiles = GitUtils.getChangedFiles(refUpdated.getProject().getRepository(),
refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
for (String changedFile: changedFiles) {
- if (PathUtils.matchChildAware(getPath(), changedFile))
+ if (PathUtils.matchChildAware(getPaths(), changedFile))
return true;
}
return false;
@@ -80,7 +80,7 @@ public class BranchPushedTrigger extends JobTrigger {
RefUpdated refUpdated = (RefUpdated) event;
String pushedBranch = GitUtils.ref2branch(refUpdated.getRefName());
if (pushedBranch != null) {
- if ((getBranch() == null || PathUtils.matchChildAware(getBranch(), pushedBranch))
+ if ((getBranches() == null || PathUtils.matchChildAware(getBranches(), pushedBranch))
&& touchedFile(refUpdated)) {
return true;
}
@@ -91,19 +91,14 @@ public class BranchPushedTrigger extends JobTrigger {
@Override
public String getDescription() {
- String condition;
- if (getBranch() != null && getPath() != null)
- condition = String.format("when push to branch %s and touch file %s", getBranch(), getPath());
- else if (getBranch() != null)
- condition = String.format("when push to branch %s", getBranch());
- else if (getPath() != null)
- condition = String.format("when push to branch %s", getBranch());
+ if (getBranches() != null && getPaths() != null)
+ return String.format("When push to branches '%s' and touch files '%s'", getBranches(), getPaths());
+ else if (getBranches() != null)
+ return String.format("When push to branches '%s'", getBranches());
+ else if (getPaths() != null)
+ return String.format("When touch files '%s'", getBranches());
else
- condition = "when push to branches";
- if (isIgnore())
- return "Do not trigger " + condition;
- else
- return "Trigger " + condition;
+ return "When push to branches";
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
index 22f398e195..7ddc3d5a35 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
@@ -8,32 +8,16 @@ import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.ci.jobparam.JobParam;
import io.onedev.server.event.ProjectEvent;
-import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.ShowCondition;
@Editable
public abstract class JobTrigger implements Serializable {
private static final long serialVersionUID = 1L;
- private boolean ignore;
-
private List<JobParam> params = new ArrayList<>();
- @Editable(order=900, description="Check to ignore triggering of the job. This is normally used to "
- + "exclude a specific condition from triggering the job, while there is a more general "
- + "condition below to trigger the job")
- public boolean isIgnore() {
- return ignore;
- }
-
- public void setIgnore(boolean ignore) {
- this.ignore = ignore;
- }
-
@Editable(order=1000)
- @ShowCondition("isParamsVisible")
public List<JobParam> getParams() {
return params;
}
@@ -42,11 +26,6 @@ public abstract class JobTrigger implements Serializable {
this.params = params;
}
- @SuppressWarnings("unused")
- private static boolean isParamsVisible() {
- return !(boolean) OneContext.get().getEditContext().getInputValue("ignore");
- }
-
protected abstract boolean matches(ProjectEvent event, CISpec ciSpec, Job job);
public abstract String getDescription();
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
index e90619c836..7419591b20 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
@@ -14,32 +14,32 @@ public class PullRequestTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String targetBranch;
+ private String targetBranches;
- @Editable(order=100, description="Optionally specify target branch of the pull request to match. "
- + "Wildcard character * and ? may be used")
+ @Editable(order=100, description="Optionally specify target branches of the pull request to check. "
+ + "Use * or ? for wildcard match")
@BranchPatterns
- public String getTargetBranch() {
- return targetBranch;
+ public String getTargetBranches() {
+ return targetBranches;
}
- public void setTargetBranch(String targetBranch) {
- this.targetBranch = targetBranch;
+ public void setTargetBranches(String targetBranches) {
+ this.targetBranches = targetBranches;
}
@Override
protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
if (event instanceof PullRequestOpened) {
PullRequestOpened pullRequestOpened = (PullRequestOpened) event;
- if (getTargetBranch() == null
- || PathUtils.matchChildAware(getTargetBranch(), pullRequestOpened.getRequest().getTargetBranch())) {
+ if (getTargetBranches() == null
+ || PathUtils.matchChildAware(getTargetBranches(), pullRequestOpened.getRequest().getTargetBranch())) {
return true;
}
}
if (event instanceof PullRequestUpdated) {
PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;
- if (getTargetBranch() == null
- || PathUtils.matchChildAware(getTargetBranch(), pullRequestUpdated.getRequest().getTargetBranch())) {
+ if (getTargetBranches() == null
+ || PathUtils.matchChildAware(getTargetBranches(), pullRequestUpdated.getRequest().getTargetBranch())) {
return true;
}
}
@@ -48,15 +48,10 @@ public class PullRequestTrigger extends JobTrigger {
@Override
public String getDescription() {
- String condition;
- if (getTargetBranch() != null)
- condition = String.format("when pull requests to branch %s are created/updated", getTargetBranch());
+ if (getTargetBranches() != null)
+ return String.format("When pull requests to branches '%s' are created/updated", getTargetBranches());
else
- condition = "when pull requests are created/updated";
- if (isIgnore())
- return "Do not trigger " + condition;
- else
- return "Trigger " + condition;
+ return "When pull requests are created/updated";
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
index d6a501c247..6c7c1d5c69 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
@@ -16,16 +16,17 @@ public class TagCreatedTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String tag;
+ private String tags;
- @Editable(order=100, description="Optionally specify tag to match. Wildcard character * and ? may be used")
+ @Editable(name="Created Tags", order=100,
+ description="Optionally specify tags to check. Use * or ? for wildcard match")
@TagPatterns
- public String getTag() {
- return tag;
+ public String getTags() {
+ return tags;
}
- public void setTag(String tag) {
- this.tag = tag;
+ public void setTags(String tags) {
+ this.tags = tags;
}
@Override
@@ -34,7 +35,7 @@ public class TagCreatedTrigger extends JobTrigger {
RefUpdated refUpdated = (RefUpdated) event;
String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());
if (pushedTag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
- && (getTag() == null || PathUtils.matchChildAware(getTag(), pushedTag))) {
+ && (getTags() == null || PathUtils.matchChildAware(getTags(), pushedTag))) {
return true;
}
}
@@ -43,16 +44,10 @@ public class TagCreatedTrigger extends JobTrigger {
@Override
public String getDescription() {
- String condition;
- if (getTag() != null)
- condition = String.format("when tag %s is created", getTag());
+ if (getTags() != null)
+ return String.format("When tags '%s' are created", getTags());
else
- condition = "when tags are created";
-
- if (isIgnore())
- return "Do not trigger " + condition;
- else
- return "Trigger " + condition;
+ return "When tags are created";
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index 9041965b76..61c1c8ee48 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -13,7 +13,7 @@
<!-- below is used to hold file navigator if there is not enough space in head -->
<div class="blob-navigator clearfix"></div>
<div wicket:id="revisionIndexing" class="revision-indexing">
- <img wicket:id="icon"></img>
+ <img wicket:id="icon">
<span>Revision indexing in progress... (search in this revision will be accurate after indexed)</span>
</div>
<div wicket:id="blobContent" class="blob-content"></div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
index b361d65140..c4664da235 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -50,7 +50,9 @@ public abstract class BlobEditPanel extends Panel {
private AbstractDefaultAjaxBehavior recreateBehavior;
- private String tabSelectionInfo;
+ private String tabSelectionInfo;
+
+ private byte[] editingContent;
public BlobEditPanel(String id, BlobRenderContext context) {
super(id);
@@ -125,21 +127,25 @@ public abstract class BlobEditPanel extends Panel {
String toTab = StringUtils.substringAfter(tabSelectionInfo, " ");
switch (toTab) {
case "edit":
- if (fromTab.equals("edit-plain")) {
- replace(editor = newEditor("editor", plainEditor.getModelObject().getBytes(Charsets.UTF_8)));
- editor.setOutputMarkupId(true);
- target.add(editor);
- }
+ if (fromTab.equals("edit-plain"))
+ editingContent = plainEditor.getModelObject().getBytes(Charsets.UTF_8);
+ replace(editor = newEditor("editor", editingContent));
+ editor.setOutputMarkupId(true);
+ target.add(editor);
break;
case "edit-plain":
- if (fromTab.equals("edit")) {
- replace(plainEditor = getPlainEditSupport().newEditor("plainEditor",
- new String(editor.getModelObject(), Charsets.UTF_8)));
- plainEditor.setOutputMarkupId(true);
- target.add(plainEditor);
- }
+ if (fromTab.equals("edit"))
+ editingContent = editor.getModelObject();
+ replace(plainEditor = getPlainEditSupport().newEditor("plainEditor",
+ new String(editingContent, Charsets.UTF_8)));
+ plainEditor.setOutputMarkupId(true);
+ target.add(plainEditor);
break;
case "save":
+ if (fromTab.equals("edit"))
+ editingContent = editor.getModelObject();
+ else
+ editingContent = plainEditor.getModelObject().getBytes(Charsets.UTF_8);
commitOption.onContentChange(target);
break;
}
@@ -163,10 +169,7 @@ public abstract class BlobEditPanel extends Panel {
@Override
public byte[] get() {
- if ("edit save".equals(tabSelectionInfo))
- return editor.getModelObject();
- else
- return plainEditor.getModelObject().getBytes(Charsets.UTF_8);
+ return editingContent;
}
}));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
index d3499afd46..61f828dff6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
@@ -139,8 +139,8 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
- if (StringUtils.isNotBlank(rowModel.getObject().getArtifacts()))
- cellItem.add(new MultilineLabel(componentId, rowModel.getObject().getArtifacts()));
+ if (StringUtils.isNotBlank(rowModel.getObject().getRetrieveArtifacts()))
+ cellItem.add(new MultilineLabel(componentId, rowModel.getObject().getRetrieveArtifacts()));
else
cellItem.add(new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
index c4860a994c..2e35ab8767 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
@@ -71,7 +71,7 @@ public class DependencyListViewPanel extends Panel {
@Override
protected Component newLabel(String componentId) {
- String artifacts = rowModel.getObject().getArtifacts();
+ String artifacts = rowModel.getObject().getRetrieveArtifacts();
if (StringUtils.isNotBlank(artifacts))
return new MultilineLabel(componentId, artifacts);
else