mirror of
https://github.com/actions/runner.git
synced 2025-12-12 05:37:01 +00:00
Merge branch 'users/ethanchewy/compositetest2' of https://github.com/actions/runner into users/ethanchewy/compositeFileTable
This commit is contained in:
@@ -476,6 +476,7 @@ namespace GitHub.Runner.Worker
|
|||||||
{
|
{
|
||||||
if (stepsLoaded == null)
|
if (stepsLoaded == null)
|
||||||
{
|
{
|
||||||
|
// TODO: Add a more helpful error message + including file name, etc. to show user that it's because of their yaml file
|
||||||
throw new ArgumentNullException($"No steps provided.");
|
throw new ArgumentNullException($"No steps provided.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -283,7 +283,7 @@ namespace GitHub.Runner.Worker
|
|||||||
// If the key already exists, we override it since the composite action env variables will have higher precedence
|
// If the key already exists, we override it since the composite action env variables will have higher precedence
|
||||||
// Note that for each composite action step, it's environment variables will be set in the StepRunner automatically
|
// Note that for each composite action step, it's environment variables will be set in the StepRunner automatically
|
||||||
step.ExecutionContext.SetEnvironmentVariables(envData);
|
step.ExecutionContext.SetEnvironmentVariables(envData);
|
||||||
Root.JobSteps.Insert(0, step);
|
Root.JobSteps.Insert(location, step);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetEnvironmentVariables(Dictionary<string, string> dict)
|
public void SetEnvironmentVariables(Dictionary<string, string> dict)
|
||||||
|
|||||||
@@ -105,6 +105,10 @@
|
|||||||
"job",
|
"job",
|
||||||
"runner",
|
"runner",
|
||||||
"env",
|
"env",
|
||||||
|
"always(0,0)",
|
||||||
|
"failure(0,0)",
|
||||||
|
"cancelled(0,0)",
|
||||||
|
"success(0,0)",
|
||||||
"hashFiles(1,255)"
|
"hashFiles(1,255)"
|
||||||
],
|
],
|
||||||
"sequence": {
|
"sequence": {
|
||||||
|
|||||||
Reference in New Issue
Block a user