|
6 | 6 |
|
7 | 7 | import com.google.gson.Gson;
|
8 | 8 | import com.google.gson.JsonSyntaxException;
|
9 |
| -import hudson.EnvVars; |
10 | 9 | import hudson.Extension;
|
11 | 10 | import hudson.model.*;
|
12 |
| -import hudson.model.queue.QueueTaskFuture; |
13 | 11 | import hudson.util.HttpResponses;
|
14 | 12 | import io.codeclou.jenkins.githubwebhookbuildtriggerplugin.config.GithubWebhookBuildTriggerPluginBuilder;
|
15 | 13 | import io.codeclou.jenkins.githubwebhookbuildtriggerplugin.webhooksecret.GitHubWebhookUtility;
|
16 | 14 | import jenkins.model.Jenkins;
|
17 | 15 | import org.apache.commons.io.IOUtils;
|
18 | 16 | import org.jenkinsci.plugins.workflow.job.WorkflowJob;
|
19 |
| -import org.jenkinsci.plugins.workflow.job.WorkflowRun; |
20 | 17 | import org.kohsuke.stapler.HttpResponse;
|
21 | 18 | import org.kohsuke.stapler.StaplerRequest;
|
22 | 19 | import org.kohsuke.stapler.interceptor.RequirePOST;
|
|
29 | 26 | import java.util.Collection;
|
30 | 27 |
|
31 | 28 | @Extension
|
32 |
| -public class GithubWebhookBuildTriggerAction implements UnprotectedRootAction, EnvironmentContributingAction { |
| 29 | +public class GithubWebhookBuildTriggerAction implements UnprotectedRootAction { |
33 | 30 |
|
34 | 31 | @Override
|
35 | 32 | public String getUrlName() {
|
@@ -123,8 +120,7 @@ public HttpResponse doReceive(HttpServletRequest request, StaplerRequest stapler
|
123 | 120 | WorkflowJob wjob = (WorkflowJob) job;
|
124 | 121 | if (wjob.isBuildable()) {
|
125 | 122 | jobsTriggered.append(" WORKFLOWJOB> ").append(job.getName()).append(" TRIGGERED\n");
|
126 |
| - wjob.addAction(environmentContributionAction.transform()); |
127 |
| - wjob.scheduleBuild(0, cause); |
| 123 | + wjob.scheduleBuild2(0, environmentContributionAction.transform(), new CauseAction(cause)); |
128 | 124 | } else {
|
129 | 125 | jobsTriggered.append(" WORKFLOWJOB> ").append(job.getName()).append(" NOT BUILDABLE. SKIPPING.\n");
|
130 | 126 | }
|
@@ -170,8 +166,4 @@ private String getTextEnvelopedInBanner(String text) {
|
170 | 166 | return banner.toString();
|
171 | 167 | }
|
172 | 168 |
|
173 |
| - @Override |
174 |
| - public void buildEnvVars(AbstractBuild<?, ?> abstractBuild, EnvVars envVars) { |
175 |
| - |
176 |
| - } |
177 | 169 | }
|
0 commit comments