From 4dc8a09db311c8d3ddf870e3de6db5f8a856d2be Mon Sep 17 00:00:00 2001 From: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:56:13 +0100 Subject: [PATCH] Only execute post for actions that have one (#1481) * Only execute post for actions that have one * Revert haspost check * Remove launch commit * Remove comment * Restore whitespace * Restore wspace --- src/Runner.Worker/ActionManager.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Runner.Worker/ActionManager.cs b/src/Runner.Worker/ActionManager.cs index d228233bd..4cebea81b 100644 --- a/src/Runner.Worker/ActionManager.cs +++ b/src/Runner.Worker/ActionManager.cs @@ -278,7 +278,7 @@ namespace GitHub.Runner.Worker } // Clone action so we can modify the condition without affecting the original var clonedAction = action.Clone() as Pipelines.ActionStep; - _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction); + _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction); } } } @@ -443,7 +443,7 @@ namespace GitHub.Runner.Worker { for (var i = 0; i < compositeAction.Steps.Count; i++) { - // Store Id's for later load actions + // Load stored Ids for later load actions compositeAction.Steps[i].Id = _cachedEmbeddedStepIds[action.Id][i]; if (string.IsNullOrEmpty(executionContext.Global.Variables.Get("DistributedTask.EnableCompositeActions")) && compositeAction.Steps[i].Reference.Type != Pipelines.ActionSourceType.Script) { @@ -451,6 +451,16 @@ namespace GitHub.Runner.Worker } } } + else + { + _cachedEmbeddedStepIds[action.Id] = new List(); + foreach (var compositeStep in compositeAction.Steps) + { + var guid = Guid.NewGuid(); + compositeStep.Id = guid; + _cachedEmbeddedStepIds[action.Id].Add(guid); + } + } } else {