The Unified and Autonomous Development Platform
Fix issue #981 - Specify branch for project dependency latest build
Robin Shenac1ff6118af8
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.javaindex 6e838081f7..ef4fab65cb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java@@ -22,7 +22,9 @@ public class LastFinishedBuild implements BuildProvider {private String jobName;- @Editable+ private String refName;++ @Editable(order=100)@OmitName@ChoiceProvider("getJobChoices")@NotEmpty@@ -34,6 +36,16 @@ public class LastFinishedBuild implements BuildProvider {this.jobName = jobName;}+ @Editable(name="Ref Name", order=200, placeholder="Any ref", description="Optionally specify ref of above job, "+ + "for instance <i>refs/heads/main</i>. Use * for wildcard match")+ public String getRefName() {+ return refName;+ }++ public void setRefName(String refName) {+ this.refName = refName;+ }+@SuppressWarnings("unused")private static List<String> getJobChoices() {Project project = ProjectDependency.getInputProject(EditContext.get(1));@@ -47,12 +59,15 @@ public class LastFinishedBuild implements BuildProvider {@Overridepublic Build getBuild(Project project) {- return OneDev.getInstance(BuildManager.class).findLastFinished(project, jobName);+ return OneDev.getInstance(BuildManager.class).findLastFinished(project, jobName, refName);}@Overridepublic String getDescription() {- return "Last finished of job '" + jobName + "'";+ if (refName != null)+ return "Last finished of job '" + jobName + "' on ref '" + refName + "'";+ else+ return "Last finished of job '" + jobName + "'";}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 59f7a1fbc9..352d4345a5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -35,7 +35,7 @@ public interface BuildManager extends EntityManager<Build> {Build find(ProjectScopedNumber buildFQN);@Nullable- Build findLastFinished(Project project, String jobName);+ Build findLastFinished(Project project, String jobName, @Nullable String refName);@NullableBuild findStreamPrevious(Build build, @Nullable Build.Status status);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex dc3ae72556..891fdd92dc 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -186,10 +186,14 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Sessional@Override- public Build findLastFinished(Project project, String jobName) {+ public Build findLastFinished(Project project, String jobName, @Nullable String refName) {EntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.eq(Build.PROP_PROJECT, project));criteria.add(Restrictions.eq(Build.PROP_JOB, jobName));+ if (refName != null) {+ refName = refName.replace("*", "%");+ criteria.add(Restrictions.ilike(Build.PROP_REF_NAME, refName));+ }criteria.add(Build.Status.ofFinished());criteria.addOrder(Order.desc(Build.PROP_NUMBER));criteria.setCacheable(true);