The Unified and Autonomous Development Platform
Fix issue #1150 - Cancel outdated pull request build if target branch changes
Robin Shen746d4e241e81
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 7d16c61e02..43f05a05a0 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -383,7 +383,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (Build unfinished : buildManager.queryUnfinished(project, jobName, reason.getRefName(),Optional.ofNullable(pullRequest), paramMapToQuery)) {if (unfinished.getId() < buildId- && gitService.isMergedInto(project, null, unfinished.getCommitId(), commitId)) {+ && (pullRequest != null || gitService.isMergedInto(project, null, unfinished.getCommitId(), commitId))) {cancel(unfinished);}}@@ -1527,7 +1527,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic Map<String, byte[]> runServerStep(JobContext jobContext, List<Integer> stepPosition,- File inputDir, Map<String, String> placeholderValues,+ File inputDir, Map<String, String> placeholderValues,boolean callByAgent, TaskLogger logger) {UUID storageServerUUID = projectManager.getStorageServerUUID(jobContext.getProjectId(), true);if (storageServerUUID.equals(clusterManager.getLocalServerUUID())) {