Merge pull request #330 from dwnusbaum/executor-widget-cleanup

`build` attribute for `buildProgressBar` should be a `Queue.Executable`, not a `Queue.Task`
jenkinsci · Aug 11, 2023 · 4fcd365 · 4fcd365
2 parents 49792d5 + 6a5d390
commit 4fcd365
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
@@ -942,7 +942,8 @@ private static final class Callback extends BodyExecutionCallback.TailCall {
          * Occupies {@link Executor} while workflow uses this build agent.
          */
         @ExportedBean
-        private final class PlaceholderExecutable implements ContinuableExecutable, AccessControlled {
+        @Restricted(NoExternalUse.class) // Class must be public for Jelly.
+        public final class PlaceholderExecutable implements ContinuableExecutable, AccessControlled {
 
             @Override public void run() {
                 TaskListener listener = null;

diff --git a/...port/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly b/...port/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
@@ -32,7 +32,7 @@
             <j:choose>
                 <j:when test="${rAuth != null}">
                     <a href="${rootURL}/${r.parent.url}"><l:breakable value="${r.parent.fullDisplayName}"/></a>
-                    <t:buildProgressBar build="${it.parent}" executor="${executor}"/>
+                    <t:buildProgressBar build="${it}" executor="${executor}"/>
                 </j:when>
                 <j:otherwise>
                     <span>${%Unknown Pipeline node step}</span>