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

Null out refName

Browse Source
This commit is contained in:
Chris Sidi
2020-05-20 21:26:37 -04:00
parent fbd859454b
commit 558f6d1a29
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Runner.Worker/ExecutionContext.cs
View File

@@ -270,6 +270,12 @@ namespace GitHub.Runner.Worker
{ {
Trace.Entering(); Trace.Entering();
// TODO: Null out old, non-json refNames only if a FF is set.
if (refName != null && !refName.StartsWith("{"))
{
refName = null;
}
var child = new ExecutionContext(); var child = new ExecutionContext();
child.Initialize(HostContext); child.Initialize(HostContext);
child.ScopeName = scopeName; child.ScopeName = scopeName;
@@ -873,7 +879,9 @@ namespace GitHub.Runner.Worker
} }
var newGuid = Guid.NewGuid(); var newGuid = Guid.NewGuid();
return CreateChild(newGuid, displayName, refName ?? newGuid.ToString("N"), null, null, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
// TODO: Check feature flag here, conditionally set refName to newGuid.ToString("N").
return CreateChild(newGuid, displayName, refName, null, null, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
} }
} }

21
src/Runner.Worker/IStepExtensions.cs
View File

@@ -6,17 +6,26 @@ namespace GitHub.Runner.Worker
{ {
public static string GetRefName(this IStep step, string defaultRefName = null) public static string GetRefName(this IStep step, string defaultRefName = null)
{ {
if (step is JobExtensionRunner extensionRunner && extensionRunner.RepositoryRef != null) // TODO: Really check a feature flag.
if (s_featureFlagEnabled)
{ {
return JsonConvert.SerializeObject(extensionRunner.RepositoryRef); if (step is JobExtensionRunner extensionRunner && extensionRunner.RepositoryRef != null)
} {
return JsonConvert.SerializeObject(extensionRunner.RepositoryRef);
}
if (step is IActionRunner actionRunner && actionRunner.Action?.Reference != null) if (step is IActionRunner actionRunner && actionRunner.Action?.Reference != null)
{ {
return JsonConvert.SerializeObject(actionRunner.Action.Reference); return JsonConvert.SerializeObject(actionRunner.Action.Reference);
}
// RefName should always be valid json or null.
return null;
} }
return defaultRefName; return defaultRefName;
} }
private static bool s_featureFlagEnabled = true;
} }
} }