Skip to content

The Unified and Autonomous Development Platform

feat: Able to access project settings from groovy script used in job trigger (OD-2674)

Robin Shen53b653bd861b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
index 542d56a2a1..2bb9a604a7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
@@ -4,6 +4,7 @@ import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.validation.Valid;
import javax.validation.ValidationException;
@@ -30,6 +31,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.service.UserService;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.util.WicketUtils;
@@ -113,7 +115,14 @@ public class RunJobAction extends PostBuildAction {
@Override
public void execute(Build build) {
- for (var paramMap: resolveParams(build, build.getParamCombination(), getParamMatrix(), getExcludeParamMaps())) {
+ List<Map<String, List<String>>> paramMaps;
+ ProjectScopedCommit.push(new ProjectScopedCommit(build.getProject(), build.getCommitId()));
+ try {
+ paramMaps = resolveParams(build, build.getParamCombination(), getParamMatrix(), getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
+ for (var paramMap: paramMaps) {
JobService jobService = OneDev.getInstance(JobService.class);
var userService = OneDev.getInstance(UserService.class);
jobService.submit(userService.getSystem(), build.getProject(), build.getCommitId(),
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
index 1013295a48..1fa22035f5 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
@@ -9,11 +9,15 @@ import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.event.project.build.BuildFinished;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
+import io.onedev.server.util.ProjectScopedCommit;
import static io.onedev.server.buildspec.param.ParamUtils.isCoveredBy;
import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;
import static java.util.stream.Collectors.toSet;
+import java.util.List;
+import java.util.Map;
+
@Editable(order=500, name="Dependency job finished")
public class DependencyFinishedTrigger extends JobTrigger {
@@ -30,9 +34,16 @@ public class DependencyFinishedTrigger extends JobTrigger {
var secretParamNames = dependency.getParamMatrix().stream()
.filter(ParamInstances::isSecret)
.map(ParamInstances::getName)
- .collect(toSet());
- for (var paramMap: resolveParams(null, null,
- dependency.getParamMatrix(), dependency.getExcludeParamMaps())) {
+ .collect(toSet());
+ List<Map<String, List<String>>> paramMaps;
+ ProjectScopedCommit.push(new ProjectScopedCommit(build.getProject(), build.getCommitId()));
+ try {
+ paramMaps = resolveParams(null, null,
+ dependency.getParamMatrix(), dependency.getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
+ for (var paramMap: paramMaps) {
if (isCoveredBy(build.getParamMap(), paramMap, secretParamNames)) {
return new TriggerMatch(build.getRefName(), build.getRequest(), build.getIssue(), getParamMatrix(),
getExcludeParamMaps(), "Dependency job '" + dependency.getJobName() + "' is finished");
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
index ed62b151f3..aaf2c1e498 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
@@ -41,7 +41,7 @@ public class ParamUtils {
}
}
- public static void validateParamMatrix(List<ParamSpec> paramSpecs, Map<String, List<List<String>>> paramMatrix) {
+ private static void validateParamMatrix(List<ParamSpec> paramSpecs, Map<String, List<List<String>>> paramMatrix) {
Map<String, ParamSpec> paramSpecMap = ParamUtils.getParamSpecMap(paramSpecs);
validateParamNames(paramSpecMap.keySet(), paramMatrix.keySet());
for (Map.Entry<String, List<List<String>>> entry: paramMatrix.entrySet()) {
@@ -126,8 +126,8 @@ public class ParamUtils {
Map<String, List<List<String>>> evaledParamMatrix = new HashMap<>();
for (ParamInstances param: paramMatrix) {
List<List<String>> values;
- if (param.getValuesProvider() instanceof SpecifiedValues)
- values = param.getValuesProvider().getValues(null, null);
+ if (param.getValuesProvider() instanceof SpecifiedValues specifiedValues)
+ values = specifiedValues.getValues();
else
values = null;
if (evaledParamMatrix.put(param.getName(), values) != null)
@@ -140,8 +140,8 @@ public class ParamUtils {
Map<String, List<String>> evaledParamMap = new HashMap<>();
for (ParamInstance param: paramMap) {
List<String> value;
- if (param.getValueProvider() instanceof SpecifiedValue)
- value = param.getValueProvider().getValue(null, null);
+ if (param.getValueProvider() instanceof SpecifiedValue specifiedValue)
+ value = specifiedValue.getValue();
else
value = null;
if (evaledParamMap.put(param.getName(), value) != null)
@@ -229,7 +229,7 @@ public class ParamUtils {
return paramMaps;
}
- public static Map<String, List<List<String>>> evalParamMatrix(@Nullable Build build,
+ private static Map<String, List<List<String>>> evalParamMatrix(@Nullable Build build,
@Nullable ParamCombination paramCombination,
List<ParamInstances> paramMatrix) {
Map<String, List<List<String>>> evaledParamMatrix = new LinkedHashMap<>();
@@ -256,7 +256,7 @@ public class ParamUtils {
return evaledParamMatrix;
}
- public static Map<String, List<String>> evalParamMap(@Nullable Build build,
+ private static Map<String, List<String>> evalParamMap(@Nullable Build build,
@Nullable ParamCombination paramCombination,
List<ParamInstance> paramMap) {
Map<String, List<String>> evaledParamMap = new LinkedHashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
index 8df87bfb95..840e889b6e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
@@ -13,6 +13,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.web.editable.BeanEditor;
@@ -20,6 +21,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;
@@ -110,10 +112,22 @@ public class UseTemplateStep extends CompositeStep {
List<Action> actions = new ArrayList<>();
AtomicInteger repeatRef = new AtomicInteger(0);
- var paramMaps = resolveParams(build, paramCombination, getParamMatrix(), getExcludeParamMaps());
+ List<Map<String, List<String>>> paramMaps;
+ var projectScopedCommit = new ProjectScopedCommit(build.getProject(), build.getCommitId());
+ ProjectScopedCommit.push(projectScopedCommit);
+ try {
+ paramMaps = resolveParams(build, paramCombination, getParamMatrix(), getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
for (var paramMap: paramMaps) {
int repeat = repeatRef.incrementAndGet();
- ParamUtils.validateParamMap(template.getParamSpecs(), paramMap);
+ ProjectScopedCommit.push(projectScopedCommit);
+ try {
+ ParamUtils.validateParamMap(template.getParamSpecs(), paramMap);
+ } finally {
+ ProjectScopedCommit.pop();
+ }
ParamCombination newParamCombination = new ParamCombination(template.getParamSpecs(), paramMap);
VariableInterpolator interpolator = new VariableInterpolator(build, newParamCombination);
diff --git a/server-core/src/main/java/io/onedev/server/event/project/DefaultBranchChanged.java b/server-core/src/main/java/io/onedev/server/event/project/DefaultBranchChanged.java
index 208725f8d4..a7ebf13663 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/DefaultBranchChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/DefaultBranchChanged.java
@@ -3,10 +3,10 @@ package io.onedev.server.event.project;
import java.util.Date;
import io.onedev.server.model.Project;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-public class DefaultBranchChanged extends ProjectEvent implements CommitAware {
+public class DefaultBranchChanged extends ProjectEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -27,7 +27,7 @@ public class DefaultBranchChanged extends ProjectEvent implements CommitAware {
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
return new ProjectScopedCommit(getProject(), getProject().getObjectId(defaultBranch, true));
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
index 0bd516b32e..27867112ae 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/RefUpdated.java
@@ -13,12 +13,12 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.service.UrlService;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.PlainText;
-public class RefUpdated extends ProjectEvent implements CommitAware {
+public class RefUpdated extends ProjectEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@ public class RefUpdated extends ProjectEvent implements CommitAware {
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
if (commit == null)
commit = new ProjectScopedCommit(getProject(), newCommitId);
return commit;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
index eaf4bec77b..0e844d13c0 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
@@ -10,12 +10,12 @@ import io.onedev.server.service.UrlService;
import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import org.jspecify.annotations.Nullable;
-public abstract class BuildEvent extends ProjectEvent implements CommitAware {
+public abstract class BuildEvent extends ProjectEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -31,7 +31,7 @@ public abstract class BuildEvent extends ProjectEvent implements CommitAware {
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
Build build = getBuild();
return new ProjectScopedCommit(build.getProject(), ObjectId.fromString(build.getCommitHash()));
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
index f8b752e8ae..1bf6032855 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueChanged.java
@@ -8,7 +8,7 @@ import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.notification.ActivityDetail;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
@@ -17,7 +17,7 @@ import org.jspecify.annotations.Nullable;
import java.util.Collection;
import java.util.Map;
-public class IssueChanged extends IssueEvent implements CommitAware {
+public class IssueChanged extends IssueEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@ public class IssueChanged extends IssueEvent implements CommitAware {
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
if (getChange().getData() instanceof IssueStateChangeData) {
var project = getIssue().getProject();
if (project.getDefaultBranch() != null)
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
index cedb45f7be..ed511cadfe 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueOpened.java
@@ -14,12 +14,12 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
-public class IssueOpened extends IssueEvent implements CommitAware {
+public class IssueOpened extends IssueEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -84,7 +84,7 @@ public class IssueOpened extends IssueEvent implements CommitAware {
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
var project = getIssue().getProject();
if (project.getDefaultBranch() != null)
return new ProjectScopedCommit(project, project.getObjectId(project.getDefaultBranch(), true));
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java
index 2e7d944499..9cba529592 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java
@@ -5,10 +5,10 @@ import java.util.Date;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-public class PullRequestBuildCommitUpdated extends PullRequestEvent implements CommitAware {
+public class PullRequestBuildCommitUpdated extends PullRequestEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -27,7 +27,7 @@ public class PullRequestBuildCommitUpdated extends PullRequestEvent implements C
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
if (getRequest().getBuildCommitHash() != null)
return new ProjectScopedCommit(getProject(), ObjectId.fromString(getRequest().getBuildCommitHash()));
else
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
index 6e635bfa72..31f4b2ac21 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestChanged.java
@@ -11,12 +11,12 @@ import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
-public class PullRequestChanged extends PullRequestEvent implements CommitAware {
+public class PullRequestChanged extends PullRequestEvent implements ProjectScopedCommitAware {
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAware
}
@Override
- public ProjectScopedCommit getCommit() {
+ public ProjectScopedCommit getProjectScopedCommit() {
ObjectId commitId;
if (getChange().getData() instanceof PullRequestMergeData) {
MergePreview preview = getRequest().checkMergePreview();
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 99f14f63cd..7bb3473d4e 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
@@ -157,7 +157,8 @@ import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;
import io.onedev.server.terminal.WebShell;
-import io.onedev.server.util.CommitAware;
+import io.onedev.server.util.ProjectScopedCommitAware;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.concurrent.BatchWorkExecutionService;
import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
@@ -342,11 +343,11 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
build.setRequest(request);
build.setIssue(issue);
- Project.push(project);
+ ProjectScopedCommit.push(new ProjectScopedCommit(project, commitId));
try {
ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
} finally {
- Project.pop();
+ ProjectScopedCommit.pop();
}
Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);
@@ -383,8 +384,14 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
for (JobDependency dependency : build.getJob().getJobDependencies()) {
JobDependency interpolated = interpolator.interpolateProperties(dependency);
- var dependencyParamMaps = resolveParams(build, build.getParamCombination(),
- interpolated.getParamMatrix(), interpolated.getExcludeParamMaps());
+ List<Map<String, List<String>>> dependencyParamMaps;
+ ProjectScopedCommit.push(new ProjectScopedCommit(project, commitId));
+ try {
+ dependencyParamMaps = resolveParams(build, build.getParamCombination(),
+ interpolated.getParamMatrix(), interpolated.getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
for (var dependencyParamMap: dependencyParamMaps) {
Build dependencyBuild = doSubmit(user, project, commitId, interpolated.getJobName(),
dependencyParamMap, refName, request, issue, reason);
@@ -397,7 +404,6 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
build.getDependencies().add(dependence);
}
}
-
for (ProjectDependency dependency : build.getJob().getProjectDependencies()) {
dependency = interpolator.interpolateProperties(dependency);
Project dependencyProject = projectService.findByPath(dependency.getProjectPath());
@@ -774,8 +780,8 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
@Sessional
@Listen
public void on(ProjectEvent event) {
- if (event instanceof CommitAware && ((CommitAware) event).getCommit() != null) {
- ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();
+ if (event instanceof ProjectScopedCommitAware && ((ProjectScopedCommitAware) event).getProjectScopedCommit() != null) {
+ ObjectId commitId = ((ProjectScopedCommitAware) event).getProjectScopedCommit().getCommitId();
if (!commitId.equals(ObjectId.zeroId())) {
PullRequest request = null;
if (event instanceof PullRequestEvent)
@@ -789,8 +795,14 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
for (Job job : buildSpec.getJobMap().values()) {
TriggerMatch match = job.getTriggerMatch(event);
if (match != null) {
- var paramMaps = resolveParams(null, null,
- match.getParamMatrix(), match.getExcludeParamMaps());
+ List<Map<String, List<String>>> paramMaps;
+ ProjectScopedCommit.push(new ProjectScopedCommit(event.getProject(), commitId));
+ try {
+ paramMaps = resolveParams(null, null,
+ match.getParamMatrix(), match.getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
Long projectId = event.getProject().getId();
// run asynchrously as session may get closed due to exception
@@ -1132,8 +1144,14 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
var commitId = schedule.getCommitId();
var nextFireTime = schedule.getCronExpression().getNextValidTimeAfter(currentTime);
if (nextFireTime != null && !nextFireTime.after(nextCheckTime)) {
- var paramMaps = resolveParams(null, null,
- match.getParamMatrix(), match.getExcludeParamMaps());
+ List<Map<String, List<String>>> paramMaps;
+ ProjectScopedCommit.push(new ProjectScopedCommit(project, commitId));
+ try {
+ paramMaps = resolveParams(null, null,
+ match.getParamMatrix(), match.getExcludeParamMaps());
+ } finally {
+ ProjectScopedCommit.pop();
+ }
for (var paramMap : paramMaps) {
var build = submit(user, project, commitId, schedule.getJobName(), paramMap,
match.getRefName(), null, null, match.getReason());
diff --git a/server-core/src/main/java/io/onedev/server/util/CommitAware.java b/server-core/src/main/java/io/onedev/server/util/CommitAware.java
deleted file mode 100644
index 5283dd591b..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/CommitAware.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.onedev.server.util;
-
-public interface CommitAware {
-
- ProjectScopedCommit getCommit();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
index 94e73767dc..18fdba4a2b 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
@@ -104,9 +104,9 @@ public class ProjectScopedCommit implements Serializable {
} else {
ComponentContext componentContext = ComponentContext.get();
if (componentContext != null) {
- CommitAware commitAware = WicketUtils.findInnermost(componentContext.getComponent(), CommitAware.class);
+ ProjectScopedCommitAware commitAware = WicketUtils.findInnermost(componentContext.getComponent(), ProjectScopedCommitAware.class);
if (commitAware != null)
- return commitAware.getCommit();
+ return commitAware.getProjectScopedCommit();
}
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommitAware.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommitAware.java
new file mode 100644
index 0000000000..c76b1c7751
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommitAware.java
@@ -0,0 +1,7 @@
+package io.onedev.server.util;
+
+public interface ProjectScopedCommitAware {
+
+ ProjectScopedCommit getProjectScopedCommit();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java
index 68b07688fd..2ff3d3aae1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionContentPanel.java
@@ -7,7 +7,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import io.onedev.server.model.Project;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -22,9 +21,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.web.editable.BeanContext;
-abstract class BuildOptionContentPanel extends Panel {
+abstract class BuildOptionContentPanel extends Panel implements ProjectScopedCommitAware {
private final List<String> refNames;
@@ -85,14 +85,14 @@ abstract class BuildOptionContentPanel extends Panel {
var branch = GitUtils.ref2branch(refName);
if (branch != null) {
- if (getProject().getTagRef(branch) != null)
+ if (getProjectScopedCommit().getProject().getTagRef(branch) != null)
item.add(new Label("label", refName));
else
item.add(new Label("label", branch));
} else {
var tag = GitUtils.ref2tag(refName);
if (tag != null) {
- if (getProject().getBranchRef(tag) != null)
+ if (getProjectScopedCommit().getProject().getBranchRef(tag) != null)
item.add(new Label("label", refName));
else
item.add(new Label("label", tag));
@@ -151,7 +151,5 @@ abstract class BuildOptionContentPanel extends Panel {
Serializable populatedParamBean);
protected abstract void onCancel(AjaxRequestTarget target);
-
- protected abstract Project getProject();
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
index de36f5a2e0..8ba506aec7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
@@ -1,15 +1,16 @@
package io.onedev.server.web.component.job;
-import io.onedev.server.buildspecmodel.inputspec.InputContext;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.component.modal.ModalPanel;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.util.ProjectScopedCommit;
+import io.onedev.server.web.component.modal.ModalPanel;
+
public abstract class BuildOptionModalPanel extends ModalPanel implements InputContext {
private final List<String> refNames;
@@ -39,8 +40,8 @@ public abstract class BuildOptionModalPanel extends ModalPanel implements InputC
}
@Override
- protected Project getProject() {
- return BuildOptionModalPanel.this.getProject();
+ public ProjectScopedCommit getProjectScopedCommit() {
+ return BuildOptionModalPanel.this.getProjectScopedCommit();
}
};
@@ -52,6 +53,6 @@ public abstract class BuildOptionModalPanel extends ModalPanel implements InputC
protected void onCancel(AjaxRequestTarget target) {
}
- protected abstract Project getProject();
+ protected abstract ProjectScopedCommit getProjectScopedCommit();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 2dcc23d0c0..55bcb4c2c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -17,6 +17,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.web.component.modal.message.MessageModal;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
import io.onedev.server.xodus.CommitInfoService;
@@ -123,8 +124,8 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
}
@Override
- protected Project getProject() {
- return RunJobLink.this.getProject();
+ protected ProjectScopedCommit getProjectScopedCommit() {
+ return new ProjectScopedCommit(getProject(), commitId);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index 7863fc5161..004a15fa73 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -7,8 +7,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Optional;
-import org.jspecify.annotations.Nullable;
-
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -21,24 +19,27 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.service.BuildService;
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.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.util.ProjectScopedCommit;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
-public abstract class JobListPanel extends Panel {
+public abstract class JobListPanel extends Panel implements ProjectScopedCommitAware {
private final ObjectId commitId;
@@ -187,4 +188,9 @@ public abstract class JobListPanel extends Panel {
response.render(CssHeaderItem.forReference(new JobListCssResourceReference()));
}
+ @Override
+ public ProjectScopedCommit getProjectScopedCommit() {
+ return new ProjectScopedCommit(getProject(), commitId);
+ }
+
}
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.java
index df407e0d01..de1a7583b9 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
@@ -104,6 +104,8 @@ import io.onedev.server.service.PullRequestService;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.FileExtension;
import io.onedev.server.util.FilenameUtils;
+import io.onedev.server.util.ProjectScopedCommit;
+import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.ChangeObserver;
@@ -140,7 +142,7 @@ import io.onedev.server.web.upload.FileUpload;
import io.onedev.server.web.util.EditParamsAware;
public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
- EditParamsAware, JobAuthorizationContextAware, ChatToolAware {
+ EditParamsAware, JobAuthorizationContextAware, ChatToolAware, ProjectScopedCommitAware {
private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";
@@ -1785,4 +1787,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}
}
+ @Override
+ public ProjectScopedCommit getProjectScopedCommit() {
+ return new ProjectScopedCommit(getProject(), getCommit().copy());
+ }
+
}