mirror of
https://github.com/actions/runner.git
synced 2026-01-13 06:21:59 +08:00
committed by
TingluoHuang
parent
e609a02c6e
commit
dc55b3c781
@@ -52,6 +52,7 @@ namespace GitHub.DistributedTask.ObjectTemplating
|
||||
internal const String String = "string";
|
||||
internal const String StringDefinition = "string-definition";
|
||||
internal const String StringDefinitionProperties = "string-definition-properties";
|
||||
internal const String StringRunnerContextNoSecrets = "string-runner-context-no-secrets";
|
||||
internal const String Structure = "structure";
|
||||
internal const String TemplateSchema = "template-schema";
|
||||
internal const String True = "true";
|
||||
|
||||
@@ -41,7 +41,8 @@ namespace GitHub.DistributedTask.Pipelines
|
||||
IEnumerable<JobStep> steps,
|
||||
IList<String> fileTable,
|
||||
TemplateToken jobOutputs,
|
||||
IList<TemplateToken> defaults)
|
||||
IList<TemplateToken> defaults,
|
||||
ActionsEnvironmentReference actionsEnvironment)
|
||||
{
|
||||
this.MessageType = JobRequestMessageTypes.PipelineAgentJobRequest;
|
||||
this.Plan = plan;
|
||||
@@ -54,7 +55,7 @@ namespace GitHub.DistributedTask.Pipelines
|
||||
this.Resources = jobResources;
|
||||
this.Workspace = workspaceOptions;
|
||||
this.JobOutputs = jobOutputs;
|
||||
|
||||
this.ActionsEnvironment = actionsEnvironment;
|
||||
m_variables = new Dictionary<String, VariableValue>(variables, StringComparer.OrdinalIgnoreCase);
|
||||
m_maskHints = new List<MaskHint>(maskHints);
|
||||
m_steps = new List<JobStep>(steps);
|
||||
@@ -228,6 +229,13 @@ namespace GitHub.DistributedTask.Pipelines
|
||||
}
|
||||
}
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
public ActionsEnvironmentReference ActionsEnvironment
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the collection of variables associated with the current context.
|
||||
/// </summary>
|
||||
|
||||
@@ -17,6 +17,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
|
||||
public const String Credentials = "credentials";
|
||||
public const String Defaults = "defaults";
|
||||
public const String Env = "env";
|
||||
public const String Environment = "environment";
|
||||
public const String Event = "event";
|
||||
public const String EventPattern = "github.event";
|
||||
public const String Exclude = "exclude";
|
||||
|
||||
@@ -279,6 +279,33 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
|
||||
return result;
|
||||
}
|
||||
|
||||
public TemplateToken EvaluateEnvironmentUrl(
|
||||
TemplateToken token,
|
||||
DictionaryContextData contextData,
|
||||
IList<IFunctionInfo> expressionFunctions)
|
||||
{
|
||||
var result = default(TemplateToken);
|
||||
if (token != null && token.Type != TokenType.Null)
|
||||
{
|
||||
var context = CreateContext(contextData, expressionFunctions);
|
||||
try
|
||||
{
|
||||
token = TemplateEvaluator.Evaluate(context, TemplateConstants.StringRunnerContextNoSecrets, token, 0, null, omitHeader: true);
|
||||
context.Errors.Check();
|
||||
result = token.AssertString("environment.url");
|
||||
}
|
||||
catch (Exception ex) when (!(ex is TemplateValidationException))
|
||||
{
|
||||
context.Errors.Add(ex);
|
||||
}
|
||||
|
||||
context.Errors.Check();
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
public Dictionary<String, String> EvaluateJobDefaultsRun(
|
||||
TemplateToken token,
|
||||
DictionaryContextData contextData,
|
||||
|
||||
@@ -515,6 +515,20 @@
|
||||
"string": {}
|
||||
},
|
||||
|
||||
"string-runner-context-no-secrets": {
|
||||
"context": [
|
||||
"github",
|
||||
"needs",
|
||||
"strategy",
|
||||
"matrix",
|
||||
"steps",
|
||||
"job",
|
||||
"runner",
|
||||
"env"
|
||||
],
|
||||
"string": {}
|
||||
},
|
||||
|
||||
"string-steps-context": {
|
||||
"context": [
|
||||
"github",
|
||||
@@ -531,4 +545,4 @@
|
||||
"string": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
23
src/Sdk/DTWebApi/WebApi/ActionsEnvironmentReference.cs
Normal file
23
src/Sdk/DTWebApi/WebApi/ActionsEnvironmentReference.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System.Runtime.Serialization;
|
||||
using GitHub.DistributedTask.ObjectTemplating.Tokens;
|
||||
|
||||
namespace GitHub.DistributedTask.WebApi
|
||||
{
|
||||
/// <summary>
|
||||
/// Information about an environment parsed from YML with evaluated name, URL will be evaluated on runner
|
||||
/// </summary>
|
||||
[DataContract]
|
||||
public class ActionsEnvironmentReference
|
||||
{
|
||||
public ActionsEnvironmentReference(string name)
|
||||
{
|
||||
Name = name;
|
||||
}
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
public string Name { get; set; }
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
public TemplateToken Url { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -131,6 +131,17 @@ namespace GitHub.DistributedTask.WebApi
|
||||
this.Outputs = outputs;
|
||||
}
|
||||
|
||||
public JobCompletedEvent(
|
||||
Int64 requestId,
|
||||
Guid jobId,
|
||||
TaskResult result,
|
||||
Dictionary<String, VariableValue> outputs,
|
||||
ActionsEnvironmentReference actionsEnvironment)
|
||||
: this(requestId, jobId, result, outputs)
|
||||
{
|
||||
this.ActionsEnvironment = actionsEnvironment;
|
||||
}
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
public Int64 RequestId
|
||||
{
|
||||
@@ -151,6 +162,13 @@ namespace GitHub.DistributedTask.WebApi
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
[DataMember(EmitDefaultValue = false)]
|
||||
public ActionsEnvironmentReference ActionsEnvironment
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
}
|
||||
|
||||
[DataContract]
|
||||
|
||||
Reference in New Issue
Block a user