The Unified and Autonomous Development Platform
Rework pull request build process to be more understandable
Robin Shend11325120cb1
diff --git a/server-core/src/main/java/io/onedev/server/ci/CISpec.java b/server-core/src/main/java/io/onedev/server/ci/CISpec.javaindex 5414408022..39d1a7b0fb 100644--- a/server-core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/CISpec.java@@ -1,7 +1,5 @@package io.onedev.server.ci;-import static java.util.stream.Collectors.toSet;-import java.io.Serializable;import java.util.ArrayList;import java.util.HashSet;@@ -16,11 +14,8 @@ import javax.validation.Valid;import javax.validation.ValidationException;import com.google.common.base.Charsets;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.commons.utils.DependencyAware;-import io.onedev.commons.utils.DependencyUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobDependency;@@ -43,8 +38,6 @@ public class CISpec implements Serializable, Validatable {private transient Map<String, Job> jobMap;- private transient List<Job> sortedJobs;-@Editable@Validpublic List<Job> getJobs() {@@ -64,37 +57,6 @@ public class CISpec implements Serializable, Validatable {return jobMap;}- /**- * Get jobs sorted by dependencies- *- * @return- */- public List<Job> getSortedJobs() {- if (sortedJobs == null) {- sortedJobs = new ArrayList<>();-- Map<String, DependencyAware<String>> dependencyMap = new LinkedHashMap<>();- for (Job job: jobs) {- dependencyMap.put(job.getName(), new DependencyAware<String>() {-- @Override- public String getId() {- return job.getName();- }-- @Override- public Set<String> getDependencies() {- return job.getJobDependencies().stream().map(it->it.getJobName()).collect(toSet());- }-- });- }- for (String jobName: DependencyUtils.sortDependencies(dependencyMap))- sortedJobs.add(Preconditions.checkNotNull(getJobMap().get(jobName)));- }- return sortedJobs;- }-@Overridepublic boolean isValid(ConstraintValidatorContext context) {boolean valid = true;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex d17194fef2..d972c3f108 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -87,7 +87,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.CommitAware;+import io.onedev.server.util.BuildCommitAware;import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.scriptidentity.JobIdentity;@@ -492,8 +492,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Sessional@Listenpublic void on(ProjectEvent event) {- if (event instanceof CommitAware) {- ObjectId commitId = ((CommitAware) event).getCommitId();+ if (event instanceof BuildCommitAware) {+ ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();if (!commitId.equals(ObjectId.zeroId())) {ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));try {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.javaindex 534defa0c4..b7f58023e7 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java@@ -28,8 +28,6 @@ public class BranchUpdateTrigger extends JobTrigger {private String paths;- private boolean rejectIfNotSuccessful;-@Editable(name="Branches", order=100,description="Optionally specify space-separated branches to check. Use * or ? for wildcard match. "+ "Leave empty to match all branches")@@ -61,16 +59,6 @@ public class BranchUpdateTrigger extends JobTrigger {this.paths = paths;}- @Editable(order=300, description="If checked, branch updating will be rejected if the triggering is not successful. "- + "It also tells pull requests to require successful triggering of the job before merging")- public boolean isRejectIfNotSuccessful() {- return rejectIfNotSuccessful;- }-- public void setRejectIfNotSuccessful(boolean rejectIfNotSuccessful) {- this.rejectIfNotSuccessful = rejectIfNotSuccessful;- }-@SuppressWarnings("unused")private static List<InputSuggestion> getPathSuggestions(String matchWith) {return SuggestionUtils.suggestBlobs(Project.get(), matchWith);@@ -124,8 +112,6 @@ public class BranchUpdateTrigger extends JobTrigger {description = String.format("When touch files '%s'", getBranches());elsedescription = "When update branches";- if (rejectIfNotSuccessful)- description += " (reject if not successful)";return description;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.javanew file mode 100644index 0000000000..62270ecc98--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java@@ -0,0 +1,113 @@+package io.onedev.server.ci.job.trigger;++import java.util.Collection;+import java.util.List;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.match.Matcher;+import io.onedev.commons.utils.match.PathMatcher;+import io.onedev.server.ci.job.Job;+import io.onedev.server.event.ProjectEvent;+import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable(order=300, name="When open/update pull requests")+public class PullRequestTrigger extends JobTrigger {++ private static final long serialVersionUID = 1L;++ private String branches;++ private String paths;++ @Editable(name="Target Branches", order=100,+ description="Optionally specify space-separated target branches of the pull requests to check. "+ + "Use * or ? for wildcard match. Leave empty to match all branches")+ @Patterns(suggester = "suggestBranches")+ @NameOfEmptyValue("Any branch")+ public String getBranches() {+ return branches;+ }++ public void setBranches(String branches) {+ this.branches = branches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }++ @Editable(name="Touched Files", order=200,+ description="Optionally specify space-separated files to check. Use * or ? for wildcard match. "+ + "Leave empty to match all files")+ @Patterns(suggester = "getPathSuggestions")+ @NameOfEmptyValue("Any file")+ public String getPaths() {+ return paths;+ }++ public void setPaths(String paths) {+ this.paths = paths;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> getPathSuggestions(String matchWith) {+ return SuggestionUtils.suggestBlobs(Project.get(), matchWith);+ }++ private boolean touchedFile(PullRequest request) {+ if (getPaths() != null) {+ Collection<String> changedFiles = GitUtils.getChangedFiles(request.getTargetProject().getRepository(),+ request.getTarget().getObjectId(), ObjectId.fromString(request.getLastMergePreview().getMerged()));+ PatternSet patternSet = PatternSet.fromString(getPaths());+ Matcher matcher = new PathMatcher();+ for (String changedFile: changedFiles) {+ if (patternSet.matches(matcher, changedFile))+ return true;+ }+ return false;+ } else {+ return true;+ }+ }++ @Override+ public boolean matches(ProjectEvent event, Job job) {+ if (event instanceof PullRequestMergePreviewCalculated) {+ PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;+ String branch = pullRequestMergePreviewCalculated.getRequest().getTargetBranch();+ if (branch != null) {+ if ((getBranches() == null || PatternSet.fromString(getBranches()).matches(new PathMatcher(), branch))+ && touchedFile(pullRequestMergePreviewCalculated.getRequest())) {+ return true;+ }+ }+ }+ return false;+ }++ @Override+ public String getDescription() {+ String description;+ if (getBranches() != null && getPaths() != null)+ description = String.format("When open/update pull requests targeting branches '%s' and touching files '%s'", getBranches(), getPaths());+ else if (getBranches() != null)+ description = String.format("When open/update pull requests targeting branches '%s'", getBranches());+ else if (getPaths() != null)+ description = String.format("When open/update pull requests touching files '%s'", getBranches());+ else+ description = "When open/update pull requests";+ return description;+ }++}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 5cd1d1a21d..c7274c57e6 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@@ -64,8 +64,8 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobManager;import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;import io.onedev.server.ci.job.trigger.JobTrigger;+import io.onedev.server.ci.job.trigger.PullRequestTrigger;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestBuildManager;import io.onedev.server.entitymanager.PullRequestChangeManager;@@ -445,7 +445,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestMergePreview preview = request.getMergePreview();if (request.isAllReviewsApproved()- && request.isAllBuildsSuccessful()+ && request.isRequiredBuildsSuccessful()&& request.getCheckError() == null&& preview != null&& preview.getMerged() != null) {@@ -716,7 +716,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}private void checkBuilds(PullRequest request) {- Collection<PullRequestBuild> prevRequirements = new ArrayList<>(request.getPullRequestBuilds());+ Collection<PullRequestBuild> prevPullRequestBuilds = new ArrayList<>(request.getPullRequestBuilds());request.getPullRequestBuilds().clear();MergePreview preview = request.getMergePreview();if (preview != null && preview.getMerged() != null) {@@ -724,44 +724,54 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestObjectId commitId = ObjectId.fromString(preview.getMerged());ScriptIdentity.push(new JobIdentity(project, commitId));try {+ Collection<String> requiredJobNames;+ BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());+ if (protection != null) {+ requiredJobNames = protection.getRequiredJobs(request.getTargetProject(), request.getTargetBranch(),+ request.getTarget().getObjectId(), commitId, new HashMap<>());+ } else {+ requiredJobNames = new HashSet<>();+ }CISpec ciSpec = project.getCISpec(commitId);if (ciSpec != null) {for (Job job: ciSpec.getJobs()) {for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof BranchUpdateTrigger) {- BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;- if (branchUpdateTrigger.isRejectIfNotSuccessful()) {- RefUpdated updated = new RefUpdated(project, GitUtils.branch2ref(request.getTargetBranch()),- request.getTarget().getObjectId(), commitId);- if (branchUpdateTrigger.matches(updated, job)) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {-- @Override- public void run(Map<String, List<String>> paramMap) {- Build build = jobManager.submit(request.getTargetProject(),- commitId, job.getName(), paramMap, null);- PullRequestBuild pullRequestBuild = null;- for (PullRequestBuild prevRequirement: prevRequirements) {- if (prevRequirement.getBuild().equals(build)) {- pullRequestBuild = prevRequirement;- break;- }+ if (trigger instanceof PullRequestTrigger) {+ PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;+ PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = new PullRequestMergePreviewCalculated(request);+ if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job)) {+ boolean required = requiredJobNames.contains(job.getName());+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ Build build = jobManager.submit(request.getTargetProject(),+ commitId, job.getName(), paramMap, null);+ PullRequestBuild pullRequestBuild = null;+ for (PullRequestBuild prevPullRequestBuild: prevPullRequestBuilds) {+ if (prevPullRequestBuild.getBuild().equals(build)) {+ pullRequestBuild = prevPullRequestBuild;+ break;}- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setRequest(request);- pullRequestBuild.setBuild(build);- }- request.getPullRequestBuilds().add(pullRequestBuild);}-- }.run();- }+ if (pullRequestBuild == null) {+ pullRequestBuild = new PullRequestBuild();+ pullRequestBuild.setRequest(request);+ pullRequestBuild.setBuild(build);+ }+ pullRequestBuild.setRequired(required);+ request.getPullRequestBuilds().add(pullRequestBuild);+ }++ }.run();+ requiredJobNames.remove(job.getName());}}}}}+ if (!requiredJobNames.isEmpty())+ throw new OneException("No pull request trigger to fire required builds: " + requiredJobNames);} finally {ScriptIdentity.pop();}diff --git a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/RefUpdated.javaindex 71ff90107e..fb9e11eaeb 100644--- a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java@@ -3,9 +3,9 @@ package io.onedev.server.event;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Project;-import io.onedev.server.util.CommitAware;+import io.onedev.server.util.BuildCommitAware;-public class RefUpdated extends ProjectEvent implements CommitAware {+public class RefUpdated extends ProjectEvent implements BuildCommitAware {private final String refName;@@ -33,7 +33,7 @@ public class RefUpdated extends ProjectEvent implements CommitAware {}@Override- public ObjectId getCommitId() {+ public ObjectId getBuildCommit() {return newCommitId;}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.javaindex 97337b529d..27e2e4a0a3 100644--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java@@ -7,9 +7,9 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.util.CommitAware;+import io.onedev.server.util.BuildCommitAware;-public class BuildEvent extends ProjectEvent implements CommitAware {+public class BuildEvent extends ProjectEvent implements BuildCommitAware {private Build build;@@ -27,7 +27,7 @@ public class BuildEvent extends ProjectEvent implements CommitAware {}@Override- public ObjectId getCommitId() {+ public ObjectId getBuildCommit() {return ObjectId.fromString(build.getCommitHash());}diff --git a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex 199f2aed2d..b6e1f10204 100644--- a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -162,7 +162,7 @@ public class GitPreReceiveCallback extends HttpServlet {if (errorMessages.isEmpty()&& !oldObjectId.equals(ObjectId.zeroId())&& !newObjectId.equals(ObjectId.zeroId())- && project.isBuildRequiredForPush(branchName, oldObjectId, newObjectId, gitEnvs)) {+ && project.isBuildRequiredForPush(user, branchName, oldObjectId, newObjectId, gitEnvs)) {errorMessages.add("Build required for your change. Please submit pull request instead");}if (errorMessages.isEmpty() && newObjectId.equals(ObjectId.zeroId())) {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 43e50b250b..82b5d6bc68 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@@ -16,7 +16,6 @@ import java.util.Map;import java.util.Set;import java.util.Stack;import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.ReadWriteLock;import java.util.stream.Collectors;@@ -68,7 +67,6 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.LockUtils;-import io.onedev.commons.utils.MatrixRunner;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;@@ -77,10 +75,6 @@ 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.ci.job.Job;-import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;@@ -348,6 +342,8 @@ public class Project extends AbstractEntity {private transient List<Milestone> sortedMilestones;+ private transient List<String> jobNames;+@Editable(order=100)@ProjectName@NotEmpty@@ -745,11 +741,17 @@ public class Project extends AbstractEntity {}public List<String> getJobNames() {- CISpec ciSpec = getCISpec(getObjectId(getDefaultBranch(), true));- if (ciSpec != null)- return new ArrayList<>(ciSpec.getJobMap().keySet());- else- return new ArrayList<>();+ if (jobNames == null) {+ Set<String> jobNameSet = new HashSet<>();+ for (RefInfo refInfo: getBranches()) {+ CISpec ciSpec = getCISpec(refInfo.getPeeledObj());+ if (ciSpec != null)+ jobNameSet.addAll(ciSpec.getJobMap().keySet());+ }+ jobNames = new ArrayList<>(jobNameSet);+ Collections.sort(jobNames);+ }+ return jobNames;}public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {@@ -1432,103 +1434,28 @@ public class Project extends AbstractEntity {}public boolean isReviewRequiredForModification(User user, String branch, @Nullable String file) {- BranchProtection branchProtection = getBranchProtection(branch, user);- if (branchProtection != null)- return branchProtection.isReviewRequiredForModification(user, this, branch, file);+ BranchProtection protection = getBranchProtection(branch, user);+ if (protection != null)+ return protection.isReviewRequiredForModification(user, this, branch, file);elsereturn false;}public boolean isReviewRequiredForPush(User user, String branch, ObjectId oldObjectId,ObjectId newObjectId, Map<String, String> gitEnvs) {- BranchProtection branchProtection = getBranchProtection(branch, user);- if (branchProtection != null) {- return branchProtection.isReviewRequiredForPush(user, this, branch, oldObjectId, newObjectId, gitEnvs);- } else {- return false;- }+ BranchProtection protection = getBranchProtection(branch, user);+ return protection != null && protection.isReviewRequiredForPush(user, this, branch, oldObjectId, newObjectId, gitEnvs);}- public boolean isBuildRequiredForModification(String branch, @Nullable String file) {- // Exclude cispec from build requirement to avoid being locking out- if (!CISpec.BLOB_PATH.equals(file)) {- try {- CISpec ciSpec = getCISpec(getObjectId(branch, true));- if (ciSpec != null) {- Matcher matcher = new PathMatcher();- for (Job job: ciSpec.getJobs()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof BranchUpdateTrigger) {- BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;- if (branchUpdateTrigger.isRejectIfNotSuccessful()- && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(matcher, branch))) {- return true;- }- }- }- }- }- } catch (Exception e) {- }- }- return false;+ public boolean isBuildRequiredForModification(User user, String branch, @Nullable String file) {+ BranchProtection protection = getBranchProtection(branch, user);+ return protection != null && protection.isBuildRequiredForModification(this, branch, file);}- public boolean isBuildRequiredForPush(String branch, ObjectId oldObjectId, ObjectId newObjectId,+ public boolean isBuildRequiredForPush(User user, String branch, ObjectId oldObjectId, ObjectId newObjectId,Map<String, String> gitEnvs) {- // Exclude cispec from build requirement to avoid being locking out- if (!getChangedFiles(oldObjectId, newObjectId, gitEnvs).contains(CISpec.BLOB_PATH)) {- Collection<Build> builds = OneDev.getInstance(BuildManager.class).query(this, newObjectId);- try {- CISpec ciSpec = getCISpec(oldObjectId);- if (ciSpec != null) {- Matcher matcher = new PathMatcher();- for (Job job: ciSpec.getJobs()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof BranchUpdateTrigger) {- BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;- if (branchUpdateTrigger.isRejectIfNotSuccessful()- && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(matcher, branch))) {- Map<String, List<List<String>>> paramMatrix = new HashMap<>();- Set<String> secretParamNames = new HashSet<>();- for (JobParam param: trigger.getParams()) {- paramMatrix.put(param.getName(), param.getValuesProvider().getValues());- if (param.isSecret())- secretParamNames.add(param.getName());- }-- AtomicReference<Build> buildRef = new AtomicReference<>(null);- new MatrixRunner<List<String>>(paramMatrix) {-- @Override- public void run(Map<String, List<String>> params) {- for (Build build: builds) {- Map<String, List<String>> paramsWithoutSecrets = new HashMap<>(params);- Map<String, List<String>> buildParamsWithoutSecrets = new HashMap<>(build.getParamMap());- paramsWithoutSecrets.keySet().removeAll(secretParamNames);- buildParamsWithoutSecrets.keySet().removeAll(secretParamNames);- if (build.getJobName().equals(job.getName())- && buildParamsWithoutSecrets.equals(paramsWithoutSecrets)) {- buildRef.set(build);- break;- }- }- }-- }.run();-- Build build = buildRef.get();- if (build == null || build.getStatus() != Build.Status.SUCCESSFUL)- return true;- }- }- }- }- }- } catch (Exception e) {- }- }- return false;+ BranchProtection protection = getBranchProtection(branch, user);+ return protection != null && protection.isBuildRequiredForPush(this, branch, oldObjectId, newObjectId, gitEnvs);}public String getSecretValue(String secretName, ObjectId commitId) {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 1c19ba2e12..8469f0c794 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -824,9 +824,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn true;}- public boolean isAllBuildsSuccessful() {- for (PullRequestBuild requirement: getPullRequestBuilds()) {- if (requirement.getBuild().getStatus() != Build.Status.SUCCESSFUL)+ public boolean isRequiredBuildsSuccessful() {+ for (PullRequestBuild pullRequestBuild: getPullRequestBuilds()) {+ if (pullRequestBuild.isRequired() && pullRequestBuild.getBuild().getStatus() != Build.Status.SUCCESSFUL)return false;}return true;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.javaindex a680df4fec..20e23feb2d 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.java@@ -20,6 +20,8 @@ public class PullRequestBuild extends AbstractEntity {public static final String ATTR_REQUEST = "request";+ public static final String ATTR_REQUIRED = "required";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private PullRequest request;@@ -28,6 +30,8 @@ public class PullRequestBuild extends AbstractEntity {@JoinColumn(nullable=false)private Build build;+ private boolean required;+public Build getBuild() {return build;}@@ -44,4 +48,12 @@ public class PullRequestBuild extends AbstractEntity {this.request = request;}+ public boolean isRequired() {+ return required;+ }++ public void setRequired(boolean required) {+ this.required = required;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex db00d04db0..23eec77820 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -2,10 +2,15 @@ package io.onedev.server.model.support;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.stream.Collectors;import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;import javax.validation.constraints.NotNull;import org.eclipse.jgit.lib.ObjectId;@@ -13,6 +18,10 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.PathMatcher;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.Usage;@@ -20,15 +29,19 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;+import io.onedev.server.web.editable.annotation.JobChoice;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@Editable@Horizontal-public class BranchProtection implements Serializable {+@ClassValidating+public class BranchProtection implements Serializable, Validatable {private static final long serialVersionUID = 1L;@@ -46,6 +59,8 @@ public class BranchProtection implements Serializable {private String reviewRequirement;+ private List<String> jobNames = new ArrayList<>();+private List<FileProtection> fileProtections = new ArrayList<>();public boolean isEnabled() {@@ -122,9 +137,21 @@ public class BranchProtection implements Serializable {this.reviewRequirement = reviewRequirement;}+ @Editable(order=500, name="Required Builds", description="Optionally choose required builds")+ @JobChoice+ @NameOfEmptyValue("No any")+ public List<String> getJobNames() {+ return jobNames;+ }++ public void setJobNames(List<String> jobNames) {+ this.jobNames = jobNames;+ }+@Editable(order=700, description="Optionally specify additional users to review "+ "particular paths. For each changed file, the first matched file protection setting will be used")@NotNull(message="may not be empty")+ @Validpublic List<FileProtection> getFileProtections() {return fileProtections;}@@ -218,6 +245,17 @@ public class BranchProtection implements Serializable {}return false;}++ public boolean isBuildRequiredForModification(Project project, String branch, @Nullable String file) {+ if (!getJobNames().isEmpty())+ return true;+ if (file != null) {+ FileProtection fileProtection = getFileProtection(file);+ if (fileProtection != null && !fileProtection.getJobNames().isEmpty())+ return true;+ }+ return false;+ }/*** Check if specified user can push specified commit to specified ref.@@ -249,5 +287,46 @@ public class BranchProtection implements Serializable {}return false;}++ public Collection<String> getRequiredJobs(Project project, String branch,+ ObjectId oldObjectId, ObjectId newObjectId, Map<String, String> gitEnvs) {+ Collection<String> requiredJobs = new HashSet<>(getJobNames());+ for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs)) {+ FileProtection fileProtection = getFileProtection(changedFile);+ if (fileProtection != null)+ requiredJobs.addAll(fileProtection.getJobNames());+ }+ return requiredJobs;+ }++ public boolean isBuildRequiredForPush(Project project, String branch, ObjectId oldObjectId,+ ObjectId newObjectId, Map<String, String> gitEnvs) {+ Collection<String> requiredJobNames = getRequiredJobs(project, branch, oldObjectId, newObjectId, gitEnvs);++ Collection<Build> builds = OneDev.getInstance(BuildManager.class).query(project, newObjectId);+ for (Build build: builds) {+ if (requiredJobNames.contains(build.getJobName()) && build.getStatus() != Status.SUCCESSFUL)+ return true;+ }+ requiredJobNames.removeAll(builds.stream().map(it->it.getJobName()).collect(Collectors.toSet()));+ return !requiredJobNames.isEmpty();+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ int index = 1;+ for (FileProtection fileProtection: getFileProtections()) {+ if (fileProtection.getJobNames().isEmpty() && fileProtection.getReviewRequirement() == null) {+ context.disableDefaultConstraintViolation();+ String message = "File protection # " + index + ": Either reviewer or required builds should be specified";+ context.buildConstraintViolationWithTemplate(message)+ .addPropertyNode("fileProtections")+ .addConstraintViolation();+ return false;+ }+ index++;+ }+ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex 5f13be509e..5a5061185c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -1,6 +1,7 @@package io.onedev.server.model.support;import java.io.Serializable;+import java.util.ArrayList;import java.util.List;import org.hibernate.validator.constraints.NotEmpty;@@ -8,6 +9,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.JobChoice;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -20,6 +23,8 @@ public class FileProtection implements Serializable {private String reviewRequirement;+ private List<String> jobNames = new ArrayList<>();+@Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")@Patterns(suggester = "getPathSuggestions")@NotEmpty@@ -39,7 +44,6 @@ public class FileProtection implements Serializable {@Editable(order=200, name="Reviewers", description="Specify required reviewers if specified path is "+ "changed. Note that the user submitting the change is considered to reviewed the change automatically")@io.onedev.server.web.editable.annotation.ReviewRequirement- @NotEmptypublic String getReviewRequirement() {return reviewRequirement;}@@ -48,4 +52,15 @@ public class FileProtection implements Serializable {this.reviewRequirement = reviewRequirement;}+ @Editable(order=500, name="Required Builds", description="Optionally choose required builds")+ @JobChoice+ @NameOfEmptyValue("No any")+ public List<String> getJobNames() {+ return jobNames;+ }++ public void setJobNames(List<String> jobNames) {+ this.jobNames = jobNames;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javanew file mode 100644index 0000000000..10dbd661e2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.From;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.BuildConstants;++public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private PullRequest value;++ public AssociatedWithPullRequestCriteria(PullRequest value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);+ return builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value);+ }++ @Override+ public boolean matches(Build build, User user) {+ return build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(value) && it.isRequired());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + BuildQuery.quote("#" + value.getNumber());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 88c075e9a1..9f31c875c7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -8,7 +8,7 @@ querycriteria: operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|AssociatedWithPullRequest|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -84,6 +84,10 @@ FixedIssue: 'fixed' WS+ 'issue';+AssociatedWithPullRequest+ : 'associated' WS+ 'with' WS+ 'pull' WS+ 'request'+ ;+RequiredByPullRequest: 'required' WS+ 'by' WS+ 'pull' WS+ 'request';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex ccb4450210..3d8101f71f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -140,6 +140,8 @@ public class BuildQuery extends EntityQuery<Build> {return new DependenciesOfCriteria(getBuild(project, value));} else if (ctx.RequiredByPullRequest() != null) {return new RequiredByPullRequestCriteria(getPullRequest(project, value));+ } else if (ctx.AssociatedWithPullRequest() != null) {+ return new AssociatedWithPullRequestCriteria(getPullRequest(project, value));} else {throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javaindex 9c11903dc0..39f095b6c9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -28,12 +28,14 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);- return builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value);+ return builder.and(+ builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value),+ builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true));}@Overridepublic boolean matches(Build build, User user) {- return build.getPullRequestBuilds().stream().anyMatch(it->it.getRequest().equals(value));+ return build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(value) && it.isRequired());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/CommitAware.java b/server-core/src/main/java/io/onedev/server/util/BuildCommitAware.javasimilarity index 54%rename from server-core/src/main/java/io/onedev/server/util/CommitAware.javarename to server-core/src/main/java/io/onedev/server/util/BuildCommitAware.javaindex a3eb01ff71..d7fccb98ee 100644--- a/server-core/src/main/java/io/onedev/server/util/CommitAware.java+++ b/server-core/src/main/java/io/onedev/server/util/BuildCommitAware.java@@ -2,8 +2,8 @@ package io.onedev.server.util;import org.eclipse.jgit.lib.ObjectId;-public interface CommitAware {+public interface BuildCommitAware {- ObjectId getCommitId();+ ObjectId getBuildCommit();}diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex 5f1fd3569b..3fa40b824e 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -104,15 +104,17 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canModify(Project project, String branch, String file) {+ User user = getUser();return canWriteCode(project.getFacade())- && !project.isReviewRequiredForModification(getUser(), branch, file)- && !project.isBuildRequiredForModification(branch, file);+ && !project.isReviewRequiredForModification(user, branch, file)+ && !project.isBuildRequiredForModification(user, branch, file);}public static boolean canPush(Project project, String branch, ObjectId oldObjectId, ObjectId newObjectId) {+ User user = getUser();return canWriteCode(project.getFacade())- && !project.isReviewRequiredForPush(getUser(), branch, oldObjectId, newObjectId, null)- && !project.isBuildRequiredForPush(branch, oldObjectId, newObjectId, null);+ && !project.isReviewRequiredForPush(user, branch, oldObjectId, newObjectId, null)+ && !project.isBuildRequiredForPush(user, branch, oldObjectId, newObjectId, null);}public static boolean canAdministrate(UserFacade user) {diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex a7b8803a14..cd171dceed 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -136,7 +136,7 @@ public class ReviewRequirement {}@Nullable- public static String onRenameGroup(String reviewRequirementString, String oldName, String newName) {+ public static String onRenameGroup(@Nullable String reviewRequirementString, String oldName, String newName) {ReviewRequirement reviewRequirement = fromString(reviewRequirementString);for (Group group: reviewRequirement.getGroups().keySet()) {if (group.getName().equals(oldName))@@ -145,7 +145,7 @@ public class ReviewRequirement {return reviewRequirement.toString();}- public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {+ public static String onRenameUser(@Nullable String reviewRequirementString, String oldName, String newName) {ReviewRequirement reviewRequirement = fromString(reviewRequirementString);for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(oldName))@@ -154,7 +154,7 @@ public class ReviewRequirement {return reviewRequirement.toString();}- public static boolean isUsingUser(String reviewRequirementString, String userName) {+ public static boolean isUsingUser(@Nullable String reviewRequirementString, String userName) {ReviewRequirement reviewRequirement = fromString(reviewRequirementString);for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(userName))@@ -163,7 +163,7 @@ public class ReviewRequirement {return false;}- public static boolean isUsingGroup(String reviewRequirementString, String groupName) {+ public static boolean isUsingGroup(@Nullable String reviewRequirementString, String groupName) {ReviewRequirement reviewRequirement = fromString(reviewRequirementString);for (Group group: reviewRequirement.getGroups().keySet()) {if (group.getName().equals(groupName))diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 891152086a..1045ad5f20 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -54,7 +54,7 @@ public class CommitStatusPanel extends Panel {protected List<Job> load() {CISpec ciSpec = getProject().getCISpec(commitId);if (ciSpec != null)- return ciSpec.getSortedJobs();+ return ciSpec.getJobs();elsereturn new ArrayList<>();}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 114641092a..981846b20e 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@@ -58,7 +58,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;@@ -351,7 +350,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SAtomicBoolean buildRequired = new AtomicBoolean(true);try {- buildRequired.set(getProject().isBuildRequiredForModification(revision, null));+ buildRequired.set(getProject().isBuildRequiredForModification(getLoginUser(), revision, null));} catch (Exception e) {logger.error("Error checking build requirement", e);}@@ -1194,14 +1193,16 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SparentPath = directory;}+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());+for (FileUpload upload: uploads) {String blobPath = upload.getClientFileName();if (parentPath != null)blobPath = parentPath + "/" + blobPath;- if (getProject().isReviewRequiredForModification(SecurityUtils.getUser(), blobIdent.revision, blobPath))+ if (getProject().isReviewRequiredForModification(user, blobIdent.revision, blobPath))throw new BlobUploadException("Review required for this change. Please submit pull request instead");- else if (getProject().isBuildRequiredForModification(blobIdent.revision, blobPath))+ else if (getProject().isBuildRequiredForModification(user, blobIdent.revision, blobPath))throw new BlobUploadException("Build required for this change. Please submit pull request instead");BlobContent blobContent = new BlobContent.Immutable(upload.getBytes(), FileMode.REGULAR_FILE);@@ -1211,8 +1212,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SBlobEdits blobEdits = new BlobEdits(Sets.newHashSet(), newBlobs);String refName = GitUtils.branch2ref(blobIdent.revision);- User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent());-ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision, true);while (true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 5e00c0464a..82dcef730f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -58,7 +58,6 @@ import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;@@ -319,11 +318,11 @@ public class CommitOptionPanel extends Panel {if (newContentProvider != null) {String revision = context.getBlobIdent().revision;String newPath = context.getNewPath();- if (context.getProject().isReviewRequiredForModification(SecurityUtils.getUser(), revision, newPath)) {+ if (context.getProject().isReviewRequiredForModification(user, revision, newPath)) {CommitOptionPanel.this.error("Review required for this change. Please submit pull request instead");target.add(feedback);return false;- } else if (context.getProject().isBuildRequiredForModification(revision, newPath)) {+ } else if (context.getProject().isBuildRequiredForModification(user, revision, newPath)) {CommitOptionPanel.this.error("Build required for this change. Please submit pull request instead");target.add(feedback);return false;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex b88a507284..14326e3a29 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -75,7 +75,7 @@ public abstract class BlobViewPanel extends Panel {String revision = context.getBlobIdent().revision;String path = context.getBlobIdent().path;boolean reviewRequired = project.isReviewRequiredForModification(user, revision, path);- boolean buildRequired = project.isBuildRequiredForModification(revision, path);+ boolean buildRequired = project.isBuildRequiredForModification(user, revision, path);if (isEditSupported()) {AjaxLink<Void> editLink = new ViewStateAwareAjaxLink<Void>("edit", true) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 36171a673e..970ad1d9fd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -245,7 +245,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {protected List<Job> load() {CISpec ciSpec = getProject().getCISpec(getCommit().copy());if (ciSpec != null)- return ciSpec.getSortedJobs();+ return ciSpec.getJobs();elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex cd6754669f..09b37c9992 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -8,7 +8,7 @@ import static io.onedev.server.search.entity.EntityQuery.quote;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.search.entity.build.BuildQueryLexer.RequiredByPullRequest;+import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;import static io.onedev.server.util.BuildConstants.FIELD_JOB;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;@@ -20,8 +20,10 @@ import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOimport java.util.ArrayList;import java.util.Arrays;import java.util.Collection;+import java.util.Comparator;+import java.util.HashMap;import java.util.List;-import java.util.Set;+import java.util.Map;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -70,7 +72,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;-import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;@@ -80,7 +81,6 @@ import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.UserInfoManager;-import io.onedev.server.ci.CISpec;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;@@ -90,6 +90,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.support.EntityWatch;@@ -496,42 +497,48 @@ public abstract class PullRequestDetailPage extends ProjectPage {fragment.add(newMergeStrategyContainer());fragment.add(new ReviewListPanel("reviews", requestModel));- fragment.add(new ListView<String>("jobs", new LoadableDetachableModel<List<String>>() {+ fragment.add(new ListView<JobBuilds>("jobs", new LoadableDetachableModel<List<JobBuilds>>() {@Override- protected List<String> load() {+ protected List<JobBuilds> load() {PullRequest request = getPullRequest();- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null) {- CISpec ciSpec = request.getTargetProject().getCISpec(ObjectId.fromString(preview.getMerged()));- if (ciSpec != null) {- Set<String> pullRequestJobNames = request.getPullRequestBuilds()- .stream()- .map(it->it.getBuild().getJobName())- .collect(Collectors.toSet());- return ciSpec.getSortedJobs()- .stream()- .map(it->it.getName())- .filter(it->pullRequestJobNames.contains(it))- .collect(Collectors.toList());+ Map<String, List<PullRequestBuild>> map = new HashMap<>();+ for (PullRequestBuild pullRequestBuild: request.getPullRequestBuilds()) {+ String jobName = pullRequestBuild.getBuild().getJobName();+ List<PullRequestBuild> list = map.get(jobName);+ if (list == null) {+ list = new ArrayList<>();+ map.put(jobName, list);}- }- return new ArrayList<>();+ list.add(pullRequestBuild);+ }+ List<JobBuilds> listOfJobBuilds = new ArrayList<>();+ for (Map.Entry<String, List<PullRequestBuild>> entry: map.entrySet()) {+ List<Build> builds = entry.getValue().stream().map(it->it.getBuild()).collect(Collectors.toList());+ Collections.sort(builds);+ listOfJobBuilds.add(new JobBuilds(entry.getKey(), entry.getValue().iterator().next().isRequired(), builds));+ }+ Collections.sort(listOfJobBuilds, new Comparator<JobBuilds>() {++ @Override+ public int compare(JobBuilds o1, JobBuilds o2) {+ return o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId());+ }++ });+ return listOfJobBuilds;}}) {@Override- protected void populateItem(ListItem<String> item) {- PullRequest request = getPullRequest();- MergePreview preview = request.getMergePreview();- Preconditions.checkState(preview != null && preview.getMerged() != null);- String jobName = item.getModelObject();+ protected void populateItem(ListItem<JobBuilds> item) {+ JobBuilds jobBuilds = item.getModelObject();- Status status = Status.getOverallStatus(request.getPullRequestBuilds()+ String jobName = jobBuilds.getJobName();+ Status status = Status.getOverallStatus(jobBuilds.getBuilds().stream()- .filter(it->it.getBuild().getJobName().equals(jobName))- .map(it->it.getBuild().getStatus())+ .map(it->it.getStatus()).collect(Collectors.toSet()));WebMarkupContainer link = new DropdownLink("job") {@@ -542,13 +549,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected List<Build> load() {- List<Build> builds = getPullRequest().getPullRequestBuilds()- .stream()- .map(it->it.getBuild())- .filter(it->it.getJobName().equals(jobName))- .collect(Collectors.toList());- Collections.sort(builds);- return builds;+ return item.getModelObject().getBuilds();}}) {@@ -556,7 +557,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected Component newListLink(String componentId) {String query = ""- + getRuleName(RequiredByPullRequest) + " " + quote("#" + getPullRequest().getNumber())+ + getRuleName(AssociatedWithPullRequest) + " " + quote("#" + getPullRequest().getNumber())+ " " + getRuleName(And) + " "+ quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,@@ -583,11 +584,14 @@ public abstract class PullRequestDetailPage extends ProjectPage {}};-+link.add(new BuildStatusIcon("status", Model.of(status)));item.add(link);-- link.add(new Label("name", jobName));++ if (jobBuilds.isRequired())+ link.add(new Label("name", jobName + " (required)"));+ else+ link.add(new Label("name", jobName));item.add(link);}@@ -1343,4 +1347,30 @@ public abstract class PullRequestDetailPage extends ProjectPage {}+ private static class JobBuilds {+ private final String jobName;++ private final boolean required;++ private final List<Build> builds;++ public JobBuilds(String jobName, boolean required, List<Build> builds) {+ this.jobName = jobName;+ this.required = required;+ this.builds = builds;+ }++ public String getJobName() {+ return jobName;+ }++ public boolean isRequired() {+ return required;+ }++ public List<Build> getBuilds() {+ return builds;+ }++ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.javaindex 359566b095..fefaf9f71a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java@@ -5,18 +5,13 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;-import org.eclipse.jgit.lib.ObjectId;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.CISpecAware;-import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")-abstract class BranchProtectionEditPanel extends Panel implements CISpecAware {+abstract class BranchProtectionEditPanel extends Panel {private final BranchProtection protection;@@ -63,13 +58,6 @@ abstract class BranchProtectionEditPanel extends Panel implements CISpecAware {add(form);}- @Override- public CISpec getCISpec() {- Project project = ((ProjectPage) getPage()).getProject();- ObjectId commitId = project.getObjectId(project.getDefaultBranch(), true);- return project.getCISpec(commitId);- }-protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);protected abstract void onCancel(AjaxRequestTarget target);