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

Merge branch 'users/ethanchewy/compositeRestrictUnknownBehavior' of https://github.com/actions/runner into compositeActionProofOfConcept

Browse Source
This commit is contained in:
Ethan Chiu
2020-07-23 12:17:08 -04:00
parent 2e50dffb37 a24e33bbcc
commit e9dcc05d75
2 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,8 +164,6 @@ namespace GitHub.Runner.Worker.Handlers
string workingDirectory = null;
if (!Inputs.TryGetValue("workingDirectory", out workingDirectory))
{
// TODO: figure out how defaults interact with template later
// for now, we won't check job.defaults if we are inside a template.
if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
{
if (runDefaults.TryGetValue("working-directory", out workingDirectory))
@@ -180,8 +178,6 @@ namespace GitHub.Runner.Worker.Handlers
string shell = null;
if (!Inputs.TryGetValue("shell", out shell) || string.IsNullOrEmpty(shell))
{
// TODO: figure out how defaults interact with template later
// for now, we won't check job.defaults if we are inside a template.
if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.Global.JobDefaults.TryGetValue("run", out var runDefaults))
{
if (runDefaults.TryGetValue("shell", out shell))