Skip to content

The Unified and Autonomous Development Platform

feat: Job can depend on a running project dependency and wait for its finish

Robin Shen10221f7fb97c
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index aca1d7bf5f..3425c3b2ac 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -2864,7 +2864,13 @@ public class BuildSpec implements Serializable, Validatable {
for (var jobTuple : ((MappingNode) jobNode).getValue()) {
if (((ScalarNode) jobTuple.getKeyNode()).getValue().equals("projectDependencies")) {
for (var dependencyNode : ((SequenceNode) jobTuple.getValueNode()).getValue()) {
- for (var dependencyTuple : ((MappingNode) dependencyNode).getValue()) {
+ var dependency = (MappingNode) dependencyNode;
+ if (getScalarProperty(dependency, "requireSuccessful") == null) {
+ dependency.getValue().add(new NodeTuple(
+ new ScalarNode(Tag.STR, "requireSuccessful"),
+ new ScalarNode(Tag.BOOL, "true")));
+ }
+ for (var dependencyTuple : dependency.getValue()) {
if (((ScalarNode) dependencyTuple.getKeyNode()).getValue().equals("buildProvider")
&& dependencyTuple.getValueNode() instanceof MappingNode buildProviderNode) {
Node refNameProviderNode = null;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index 636d84f1a5..068b6513a3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -35,6 +35,8 @@ public class ProjectDependency implements Serializable {
private String projectPath;
private BuildProvider buildProvider = new LatestBuild();
+
+ private boolean requireSuccessful = true;
private String artifacts = "**";
@@ -81,6 +83,15 @@ public class ProjectDependency implements Serializable {
this.buildProvider = buildProvider;
}
+ @Editable(order=350, description="Whether or not to require this dependency to be successful")
+ public boolean isRequireSuccessful() {
+ return requireSuccessful;
+ }
+
+ public void setRequireSuccessful(boolean requireSuccessful) {
+ this.requireSuccessful = requireSuccessful;
+ }
+
@Nullable
static Project getInputProject(EditContext editContext) {
String projectPath = (String) editContext.getInputValue("projectPath");
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index feccf352e0..ef5ea99558 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -389,6 +389,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
BuildDependence dependence = new BuildDependence();
dependence.setDependency(dependencyBuild);
dependence.setDependent(build);
+ dependence.setRequireSuccessful(dependency.isRequireSuccessful());
dependence.setArtifacts(dependency.getArtifacts());
dependence.setDestinationPath(dependency.getDestinationPath());
build.getDependencies().add(dependence);
diff --git a/server-core/src/main/java/io/onedev/server/service/BuildService.java b/server-core/src/main/java/io/onedev/server/service/BuildService.java
index c0b06669c6..57883aeb68 100644
--- a/server-core/src/main/java/io/onedev/server/service/BuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/BuildService.java
@@ -37,7 +37,7 @@ public interface BuildService extends EntityService<Build> {
Build find(String uuid);
@Nullable
- Build findLatest(Project project, String jobName, @Nullable String refName);
+ Build findLatest(Project project, String jobName, @Nullable String refNamePattern);
@Nullable
Build findStreamPrevious(Build build, Build.@Nullable Status status);
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
index dcee8ba8e7..42868c353b 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
@@ -214,13 +214,13 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui
@Sessional
@Override
- public Build findLatest(Project project, String jobName, @Nullable String refName) {
+ public Build findLatest(Project project, String jobName, @Nullable String refNamePattern) {
EntityCriteria<Build> criteria = newCriteria();
criteria.add(Restrictions.eq(Build.PROP_PROJECT, project));
criteria.add(Restrictions.eq(Build.PROP_JOB_NAME, jobName));
- if (refName != null) {
- refName = refName.replace("*", "%");
- criteria.add(Restrictions.ilike(Build.PROP_REF_NAME, refName));
+ if (refNamePattern != null) {
+ refNamePattern = refNamePattern.replace("*", "%");
+ criteria.add(Restrictions.ilike(Build.PROP_REF_NAME, refNamePattern));
}
criteria.addOrder(Order.desc(Build.PROP_NUMBER));
criteria.setCacheable(true);