Skip to content

The Unified and Autonomous Development Platform

chore: Refactor step and executor matching

Robin Shena68f9784b0b9
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
index 2fa24c5133..e942e7b053 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
@@ -25,9 +25,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.job.JobContext;
import io.onedev.server.job.JobManager;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.util.patternset.PatternSet;
@@ -127,9 +125,4 @@ public class PublishSiteStep extends ServerSideStep {
});
}
- @Override
- public boolean isApplicable(Build build, JobExecutor executor) {
- return executor.isSitePublishEnabled();
- }
-
}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
index 474e241258..0718814237 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
@@ -23,7 +23,6 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.job.JobContext;
import io.onedev.server.job.JobManager;
import io.onedev.server.model.Build;
-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.persistence.SessionManager;
@Editable(order=1070, group= StepGroup.PUBLISH, name="Html Report")
@@ -97,9 +96,4 @@ public class PublishHtmlReportStep extends PublishReportStep {
return PublishHtmlReportStep.class.getName() + ":" + projectId + ":" + buildNumber;
}
- @Override
- public boolean isApplicable(Build build, JobExecutor executor) {
- return executor.isHtmlReportPublishEnabled();
- }
-
}