actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-12 05:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Null Ref Issues Composite Actions (#657)

Browse Source
This commit is contained in:
Ethan Chiu
2020-08-12 17:12:54 -04:00
committed by GitHub
parent 8c29e33e88
commit 9e7b56f698
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Runner.Worker/Handlers/CompositeActionHandler.cs
View File

@@ -91,7 +91,7 @@ namespace GitHub.Runner.Worker.Handlers
ProcessCompositeActionOutputs(); ProcessCompositeActionOutputs();
ExecutionContext.Global.StepsContext.ClearScope(ExecutionContext.GetFullyQualifiedContextName()); ExecutionContext.Global.StepsContext.ClearScope(childScopeName);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -137,13 +137,20 @@ namespace GitHub.Runner.Worker.Handlers
var outputsName = pair.Key; var outputsName = pair.Key;
var outputsAttributes = pair.Value as DictionaryContextData; var outputsAttributes = pair.Value as DictionaryContextData;
outputsAttributes.TryGetValue("value", out var val); outputsAttributes.TryGetValue("value", out var val);
var outputsValue = val as StringContextData;
if (val != null)
{
var outputsValue = val as StringContextData;
// Set output in the whole composite scope. // Set output in the whole composite scope.
if (!String.IsNullOrEmpty(outputsName) && !String.IsNullOrEmpty(outputsValue)) if (!String.IsNullOrEmpty(outputsValue))
{ {
ExecutionContext.SetOutput(outputsName, outputsValue, out _); ExecutionContext.SetOutput(outputsName, outputsValue, out _);
} }
else
{
ExecutionContext.SetOutput(outputsName, "", out _);
}
}
} }
} }
} }