The Unified and Autonomous Development Platform
fix issue #145: Show submit reason of build
Robin Shen0d126a6bb93f
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex e574ef79f8..cd8bb874b2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -34,6 +34,7 @@ import javax.validation.Validator;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -59,7 +60,6 @@ import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.buildspec.job.paramspec.SecretParam;import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.buildspec.job.retrycondition.RetryCondition;-import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.ProjectManager;@@ -172,7 +172,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Transactional@Overridepublic Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, @Nullable String updatedRef) {+ Map<String, List<String>> paramMap, String reason, @Nullable String updatedRef) {Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());transactionManager.mustRunAfterTransaction(new Runnable() {@@ -189,14 +189,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizvalidate(project, commitId);- return submit(project, commitId, jobName, paramMap, updatedRef, new LinkedHashSet<>());+ return submit(project, commitId, jobName, paramMap, reason,+ updatedRef, new LinkedHashSet<>());} catch (Throwable e) {throw ExceptionUtils.unchecked(e);}}private Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, String updatedRef, Set<String> checkedJobNames) {+ Map<String, List<String>> paramMap, String reason,+ String updatedRef, Set<String> checkedJobNames) {ScriptIdentity.push(new JobIdentity(project, commitId));try {@@ -206,6 +208,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setJobName(jobName);build.setSubmitDate(new Date());build.setStatus(Build.Status.WAITING);+ build.setSubmitReason(reason);build.setSubmitter(SecurityUtils.getUser());build.setUpdatedRef(updatedRef);@@ -253,7 +256,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run(Map<String, List<String>> params) {Build dependencyBuild = submit(project, commitId, dependency.getJobName(),- params, updatedRef, new LinkedHashSet<>(checkedJobNames));+ params, reason, updatedRef, new LinkedHashSet<>(checkedJobNames));BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);@@ -599,9 +602,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuildSpec buildSpec = event.getProject().getBuildSpec(commitId);if (buildSpec != null) {for (Job job: buildSpec.getJobs()) {- JobTrigger trigger = job.getMatchedTrigger(event);- if (trigger != null) {- Map<String, List<List<String>>> paramMatrix = ParamSupply.getParamMatrix(trigger.getParams());+ JobTriggerMatch match = job.getTriggerMatch(event);+ if (match != null) {+ Map<String, List<List<String>>> paramMatrix =+ ParamSupply.getParamMatrix(match.getTrigger().getParams());Long projectId = event.getProject().getId();String updatedRef;@@ -619,13 +623,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run() {+ ThreadContext.bind(userManager.getSystem().asSubject());+Project project = projectManager.load(projectId);try {new MatrixRunner<List<String>>(paramMatrix) {@Overridepublic void run(Map<String, List<String>> paramMap) {- submit(project, commitId, job.getName(), paramMap, updatedRef);+ submit(project, commitId, job.getName(), paramMap,+ match.getReason(), updatedRef);}}.run();@@ -667,6 +674,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setRunningDate(null);build.setSubmitDate(new Date());build.setSubmitter(SecurityUtils.getUser());+ build.setSubmitReason("Resubmitted manually");build.setCanceller(null);build.setCancellerName(null);build.setUpdatedRef(null);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 461ab13d51..90bf4259a9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -415,10 +415,12 @@ public class Job implements Serializable, Validatable {this.defaultFixedIssuesFilter = defaultFixedIssuesFilterQuery;}- public JobTrigger getMatchedTrigger(ProjectEvent event) {+ @Nullable+ public JobTriggerMatch getTriggerMatch(ProjectEvent event) {for (JobTrigger trigger: getTriggers()) {- if (trigger.matches(event, this))- return trigger;+ String reason = trigger.matches(event, this);+ if (reason != null)+ return new JobTriggerMatch(trigger, reason);}return null;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.javaindex b62029eb31..c16f708d62 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;public interface JobManager {Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, String updatedRef);+ Map<String, List<String>> paramMap, String reason, String updatedRef);void resubmit(Build build, Map<String, List<String>> paramMap);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.javanew file mode 100644index 0000000000..14add71a2c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.java@@ -0,0 +1,24 @@+package io.onedev.server.buildspec.job;++import io.onedev.server.buildspec.job.trigger.JobTrigger;++public class JobTriggerMatch {++ private final JobTrigger trigger;++ private final String reason;++ public JobTriggerMatch(JobTrigger trigger, String reason) {+ this.trigger = trigger;+ this.reason = reason;+ }++ public JobTrigger getTrigger() {+ return trigger;+ }++ public String getReason() {+ return reason;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex ed247931d7..283654b088 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -89,7 +89,8 @@ public class RunJobAction extends PostBuildAction {@Overridepublic void run(Map<String, List<String>> paramMap) {OneDev.getInstance(JobManager.class).submit(build.getProject(),- build.getCommitId(), getJobName(), paramMap, null);+ build.getCommitId(), getJobName(), paramMap,+ "Post build action of job '" + build.getJobName() + "'", null);}}.run();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex afed13b6b1..4858cdd870 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -86,16 +86,18 @@ public class BranchUpdateTrigger extends JobTrigger {}@Override- public boolean matchesWithoutProject(ProjectEvent event, Job job) {+ public String matchesWithoutProject(ProjectEvent event, Job job) {if (event instanceof RefUpdated) {RefUpdated refUpdated = (RefUpdated) event;String updatedBranch = GitUtils.ref2branch(refUpdated.getRefName());Matcher matcher = new PathMatcher();- return updatedBranch != null+ if (updatedBranch != null&& (branches == null || PatternSet.parse(branches).matches(matcher, updatedBranch))- && touchedFile(refUpdated);+ && touchedFile(refUpdated)) {+ return "Branch '" + updatedBranch + "' is updated";+ }}- return false;+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.javaindex 7805f65a71..2f1933ce38 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java@@ -17,7 +17,7 @@ public class DependencyFinishedTrigger extends JobTrigger {private static final long serialVersionUID = 1L;@Override- public boolean matchesWithoutProject(ProjectEvent event, Job job) {+ public String matchesWithoutProject(ProjectEvent event, Job job) {if (event instanceof BuildFinished) {BuildFinished buildFinished = (BuildFinished) event;Build build = buildFinished.getBuild();@@ -28,14 +28,14 @@ public class DependencyFinishedTrigger extends JobTrigger {if (!param.isSecret()) {List<String> paramValue = build.getParamMap().get(param.getName());if (!param.getValuesProvider().getValues().contains(paramValue))- return false;+ return null;}}- return true;+ return "Dependency job '" + dependency.getJobName() + "' is finished";}}}- return false;+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.javaindex 05a5491f0c..642e588523 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;+import javax.annotation.Nullable;import javax.validation.Valid;import org.apache.wicket.Component;@@ -78,11 +79,14 @@ public abstract class JobTrigger implements Serializable {return new ArrayList<>();}- public boolean matches(ProjectEvent event, Job job) {+ @Nullable+ public String matches(ProjectEvent event, Job job) {String projectName = event.getProject().getName();Matcher matcher = new StringMatcher();- return (projects == null || PatternSet.parse(projects).matches(matcher, projectName))- && matchesWithoutProject(event, job);+ if (projects == null || PatternSet.parse(projects).matches(matcher, projectName))+ return matchesWithoutProject(event, job);+ else+ return null;}public String getDescription() {@@ -92,7 +96,8 @@ public abstract class JobTrigger implements Serializable {return description;}- public abstract boolean matchesWithoutProject(ProjectEvent event, Job job);+ @Nullable+ public abstract String matchesWithoutProject(ProjectEvent event, Job job);public abstract String getDescriptionWithoutProject();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 00eb49c0ba..09056486c1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -82,7 +82,7 @@ public class PullRequestTrigger extends JobTrigger {}@Override- public boolean matchesWithoutProject(ProjectEvent event, Job job) {+ public String matchesWithoutProject(ProjectEvent event, Job job) {if (event instanceof PullRequestMergePreviewCalculated) {PullRequestMergePreviewCalculated mergePreviewCalculated = (PullRequestMergePreviewCalculated) event;PullRequest request = mergePreviewCalculated.getRequest();@@ -90,10 +90,13 @@ public class PullRequestTrigger extends JobTrigger {Matcher matcher = new PathMatcher();if ((branches == null || PatternSet.parse(branches).matches(matcher, targetBranch))&& touchedFile(request)) {- return true;+ if (request.getUpdates().size() == 1)+ return "Pull request #" + request.getNumber() + " is opened";+ else+ return "Pull request #" + request.getNumber() + " is updated";}}- return false;+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.javaindex 8b141611ba..17f0ececce 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java@@ -63,7 +63,7 @@ public class TagCreateTrigger extends JobTrigger {}@Override- public boolean matchesWithoutProject(ProjectEvent event, Job job) {+ public String matchesWithoutProject(ProjectEvent event, Job job) {if (event instanceof RefUpdated) {RefUpdated refUpdated = (RefUpdated) event;String updatedTag = GitUtils.ref2tag(refUpdated.getRefName());@@ -72,10 +72,10 @@ public class TagCreateTrigger extends JobTrigger {if (updatedTag != null && !commitId.equals(ObjectId.zeroId())&& (tags == null || PatternSet.parse(tags).matches(new PathMatcher(), updatedTag))&& (branches == null || project.isCommitOnBranches(commitId, branches))) {- return true;+ return "Tag '" + updatedTag + "' is created";}}- return false;+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 47e64f6922..a0362e295a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -826,14 +826,19 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (trigger instanceof PullRequestTrigger) {PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = new PullRequestMergePreviewCalculated(request);- if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job)) {+ if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job) != null) {boolean required = requiredJobNames.contains(job.getName());+ String submitReason;+ if (request.getUpdates().size() == 1)+ submitReason = "Pull request #" + request.getNumber() + " is opened";+ else+ submitReason = "Pull request #" + request.getNumber() + " is updated";new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(trigger.getParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {Build build = jobManager.submit(request.getTargetProject(),- commitId, job.getName(), paramMap, null);+ commitId, job.getName(), paramMap, submitReason, null);PullRequestVerification verification = null;for (PullRequestVerification prevVerification: prevVerifications) {if (prevVerification.getBuild().equals(build)) {diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.javaindex 83674cb906..9f5ef33368 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java@@ -28,4 +28,5 @@ public abstract class ProjectEvent extends Event {lastUpdate.setDate(getDate());return lastUpdate;}+}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 272e245b8f..02238d723e 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -271,6 +271,9 @@ public class Build extends AbstractEntity implements Referenceable {private String updatedRef;+ @Column(nullable=false, length=1000)+ private String submitReason;+@Column(length=MAX_ERROR_MESSAGE_LEN)private String errorMessage;@@ -444,6 +447,14 @@ public class Build extends AbstractEntity implements Referenceable {this.submitDate = submitDate;}+ public String getSubmitReason() {+ return submitReason;+ }++ public void setSubmitReason(String submitReason) {+ this.submitReason = submitReason;+ }+public Date getPendingDate() {return pendingDate;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlindex 475b49f6c0..7e47bed179 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -24,6 +24,10 @@<div class="name">Submitted At</div><div class="value"><span wicket:id="submitDate"></span></div></div>+ <div>+ <div class="reason">Submit Reason</div>+ <div class="value"><span wicket:id="submitReason"></span></div>+ </div><wicket:enclosure child="retryDate"><div><div class="name">Retried At</div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 52ffa09fba..fd44d62022 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -141,6 +141,14 @@ public abstract class BuildSidePanel extends Panel {return DateUtils.formatAge(getBuild().getSubmitDate());}+ }));+ general.add(new Label("submitReason", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getBuild().getSubmitReason();+ }+}));general.add(new Label("retryDate", new LoadableDetachableModel<String>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex e93a8fa7db..e3bd601aef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -65,7 +65,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {Map<String, List<String>> paramMap = ParamSupply.getParamMap(job, bean, job.getParamSpecMap().keySet());Build build = OneDev.getInstance(JobManager.class).submit(getProject(),- commitId, job.getName(), paramMap, null);+ commitId, job.getName(), paramMap, "Submitted manually", null);setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));}@@ -87,7 +87,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {};} else {Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,- job.getName(), new HashMap<>(), null);+ job.getName(), new HashMap<>(), "Submitted manually", null);setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));}}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 9288ffcf50..cd8a6555e5 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@@ -194,7 +194,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sstate.urlAfterEdit = params.get(PARAM_URL_AFTER_EDIT).toString();if (state.blobIdent.revision != null)- resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);+ resolvedRevision = getProject().getRevCommit(state.blobIdent.revision, true).copy();state.position = params.get(PARAM_POSITION).toString();@@ -332,9 +332,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S};break;case "permalink":- BlobIdent newBlobIdent = new BlobIdent(state.blobIdent);- newBlobIdent.revision = resolvedRevision.name();- ProjectBlobPage.this.onSelect(target, newBlobIdent, null);+ if (isOnBranch()) {+ BlobIdent newBlobIdent = new BlobIdent(state.blobIdent);+ newBlobIdent.revision = resolvedRevision.name();+ ProjectBlobPage.this.onSelect(target, newBlobIdent, null);+ }break;default:throw new IllegalStateException("Unexpected action: " + action);@@ -893,7 +895,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S* resolved to existing value of resolvedRevision*/resolvedRevision = null;- resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);+ resolvedRevision = getProject().getRevCommit(state.blobIdent.revision, true).copy();OneDev.getInstance(WebSocketManager.class).observe(this);newRevisionPicker(target);@@ -1436,7 +1438,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SObjectId prevCommitId;if (blobIdent.revision != null)- prevCommitId = getProject().getObjectId(blobIdent.revision, true);+ prevCommitId = getProject().getRevCommit(blobIdent.revision, true).copy();elseprevCommitId = ObjectId.zeroId();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex c1f1b7deab..226218744d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -26,7 +26,11 @@<a wicket:id="moreInfo" class="more-info" title="More info"><span class="fa fa-ellipsis-h"></span></a></div><div wicket:id="requestSummary" class="summary resize-aware">- <div wicket:id="checkError" class="alert alert-danger"></div>+ <wicket:enclosure>+ <div class="alert alert-danger">+ <i class="fa fa-exclamation-circle"></i> <span wicket:id="checkError"></span>+ </div>+ </wicket:enclosure><div wicket:id="discarded" class="discarded alert alert-danger"><i class="fa fa-exclamation-circle"></i> This pull request has been discarded</div>