The Unified and Autonomous Development Platform
Fix issue #1349 - Pull request open/update trigger does not fire build when pull request is opened
Robin Shen17bcdfe4fc9e
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.javaindex 179394b70a..645ed7ca1c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java@@ -1,11 +1,10 @@package io.onedev.server.buildspec.job.trigger;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.TriggerMatch;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.event.project.pullrequest.PullRequestBuildCommitUpdated;-import io.onedev.server.model.PullRequest;-import io.onedev.server.annotation.Editable;@Editable(order=300, name="Pull request open or update", description=""+ "Job will run on merge commit of target branch and source branch.<br>"@@ -20,7 +19,7 @@ public class PullRequestUpdateTrigger extends PullRequestTrigger {protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {if (event instanceof PullRequestBuildCommitUpdated) {PullRequestBuildCommitUpdated pullRequestBuildCommitUpdated = (PullRequestBuildCommitUpdated) event;- PullRequest request = pullRequestBuildCommitUpdated.getRequest();+ var request = pullRequestBuildCommitUpdated.getRequest();if (request.getBuildRequirement().getRequiredJobs().contains(job.getName()) || !SKIP_COMMIT.apply(request.getLatestUpdate().getHeadCommit()))return triggerMatches(request);}diff --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 b8666a6042..3526b86026 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@@ -334,10 +334,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>if (mergePreview != null)updateMergePreviewRef(request);- if (request.getBuildCommitHash() != null)- updateBuildCommitRef(request);-- checkAsync(request, false, request.getBuildCommitHash() == null);+ checkAsync(request, false, true);listenerRegistry.post(new PullRequestOpened(request));}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.javaindex 53029dab23..f2e3228638 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java@@ -1,15 +1,10 @@package io.onedev.server.event.project.pullrequest;-import java.util.Date;--import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.util.CommitAware;-import io.onedev.server.util.ProjectScopedCommit;-public class PullRequestMergePreviewUpdated extends PullRequestEvent implements CommitAware {+import java.util.Date;++public class PullRequestMergePreviewUpdated extends PullRequestEvent {private static final long serialVersionUID = 1L;@@ -27,13 +22,4 @@ public class PullRequestMergePreviewUpdated extends PullRequestEvent implementsreturn true;}- @Override- public ProjectScopedCommit getCommit() {- MergePreview mergePreview = getRequest().checkMergePreview();- if (mergePreview != null && mergePreview.getMergeCommitHash() != null)- return new ProjectScopedCommit(getProject(), ObjectId.fromString(mergePreview.getMergeCommitHash()));- else- return new ProjectScopedCommit(getProject(), ObjectId.zeroId());- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex a6cc9f060a..be1bd6bf16 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -840,10 +840,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.AnnomergePreview.setHeadCommitHash(request.getLatestUpdate().getHeadCommitHash());mergePreview.setMergeStrategy(request.getMergeStrategy());ObjectId merged = mergePreview.getMergeStrategy().merge(request, "Pull request merge preview");- if (merged != null) {+ if (merged != null)mergePreview.setMergeCommitHash(merged.name());- request.setBuildCommitHash(merged.name());- }request.setMergePreview(mergePreview);if (merged != null) {