actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-27 03:48:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add safety check to prevent from checking defaults in ScriptHandler for composite action"

Browse Source 
This reverts commit aeae15de7b.
This commit is contained in:
Ethan Chiu
2020-07-21 14:45:58 -04:00
parent aeae15de7b
commit a22fcbc036
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Runner.Worker/Handlers/ScriptHandler.cs
View File

@@ -153,7 +153,7 @@ namespace GitHub.Runner.Worker.Handlers
{
// TODO: figure out how defaults interact with template later
// for now, we won't check job.defaults if we are inside a template.
if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
{
if (runDefaults.TryGetValue("working-directory", out workingDirectory))
{
@@ -169,7 +169,7 @@ namespace GitHub.Runner.Worker.Handlers
{
// TODO: figure out how defaults interact with template later
// for now, we won't check job.defaults if we are inside a template.
if (!ExecutionContext.IsComposite && string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
{
if (runDefaults.TryGetValue("shell", out shell))
{