Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix verbose breaks jsonl logger #474

Merged
merged 4 commits into from
Dec 11, 2024
Merged

fix verbose breaks jsonl logger #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03b6702
fix verbose breaks jsonl logger
ChristopherHX Dec 11, 2024
d235f38
Apply suggestions from code review
ChristopherHX Dec 11, 2024
213c5c9
fix last log level
ChristopherHX Dec 11, 2024
84af31a
add timestamp
ChristopherHX Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/Runner.Client/ExternalToolHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private static string runnerOfficialUrl(string runner_URL, string runner12_VERSI
return $"{runner_URL}/v{runner12_VERSION}/runner-v{runner12_VERSION}-{os}-{arch}.{suffix}";
}

private static async Task DownloadTool(string link, string destDirectory, CancellationToken token, string tarextraopts = "", bool unwrap = false) {
private static async Task DownloadTool(Program.Parameters parameters, string link, string destDirectory, CancellationToken token, string tarextraopts = "", bool unwrap = false) {
Console.WriteLine($"Downloading from {link} to {destDirectory}");
string tempDirectory = Path.Combine(GitHub.Runner.Sdk.GharunUtil.GetLocalStorage(), "temp" + System.Guid.NewGuid().ToString());
var stagingDirectory = Path.Combine(tempDirectory, "_staging");
Expand Down Expand Up @@ -117,7 +117,7 @@ private static async Task DownloadTool(string link, string destDirectory, Cancel
string tar = WhichUtil.Which("tar", require: true);

// tar -xzf
using (var processInvoker = new ProcessInvoker(new Program.TraceWriter()))
using (var processInvoker = new ProcessInvoker(new Program.TraceWriter(parameters)))
{
processInvoker.OutputDataReceived += new EventHandler<ProcessDataReceivedEventArgs>((sender, args) =>
{
Expand Down Expand Up @@ -164,7 +164,7 @@ private static async Task DownloadTool(string link, string destDirectory, Cancel
IOUtil.DeleteDirectory(tempDirectory, CancellationToken.None);
}
}
public static async Task<string> GetAgent(string name, string version, CancellationToken token) {
internal static async Task<string> GetAgent(Program.Parameters parameters, string name, string version, CancellationToken token) {
// Allow versions like v3.0.0 and not only 3.0.0
version = version.Substring(version.IndexOf("v") + 1);
var azagent = name == "azagent";
Expand All @@ -180,14 +180,14 @@ public static async Task<string> GetAgent(string name, string version, Cancellat
// Note use the vsts package, because container operations have node6 hardcoded as trampoline
Func<string, string, string> AURL = azagent ? (arch, ext) => $"https://vstsagentpackage.azureedge.net/agent/{version}/vsts-agent-{arch}-{version}.{ext}" : (arch, ext) => $"https://github.com/actions/runner/releases/download/v{version}/actions-runner-{arch}-{version}.{ext}";
var _tools = new Dictionary<string, Func<string, Task>> {
{ "windows/386", dest => DownloadTool(AURL("win-x86", "zip"), dest, token, unwrap: false)},
{ "windows/amd64", dest => DownloadTool(AURL("win-x64", "zip"), dest, token, unwrap: false)},
{ "windows/arm64", dest => DownloadTool(AURL("win-arm64", "zip"), dest, token, unwrap: false)},
{ "linux/amd64", dest => DownloadTool(AURL("linux-x64", "tar.gz"), dest, token, unwrap: false)},
{ "linux/arm", dest => DownloadTool(AURL("linux-arm", "tar.gz"), dest, token, unwrap: false)},
{ "linux/arm64", dest => DownloadTool(AURL("linux-arm64", "tar.gz"), dest, token, unwrap: false)},
{ "osx/amd64", dest => DownloadTool(AURL("osx-x64", "tar.gz"), dest, token, unwrap: false)},
{ "osx/arm64", dest => DownloadTool(AURL("osx-arm64", "tar.gz"), dest, token, unwrap: false)},
{ "windows/386", dest => DownloadTool(parameters, AURL("win-x86", "zip"), dest, token, unwrap: false)},
{ "windows/amd64", dest => DownloadTool(parameters, AURL("win-x64", "zip"), dest, token, unwrap: false)},
{ "windows/arm64", dest => DownloadTool(parameters, AURL("win-arm64", "zip"), dest, token, unwrap: false)},
{ "linux/amd64", dest => DownloadTool(parameters, AURL("linux-x64", "tar.gz"), dest, token, unwrap: false)},
{ "linux/arm", dest => DownloadTool(parameters, AURL("linux-arm", "tar.gz"), dest, token, unwrap: false)},
{ "linux/arm64", dest => DownloadTool(parameters, AURL("linux-arm64", "tar.gz"), dest, token, unwrap: false)},
{ "osx/amd64", dest => DownloadTool(parameters, AURL("osx-x64", "tar.gz"), dest, token, unwrap: false)},
{ "osx/arm64", dest => DownloadTool(parameters, AURL("osx-arm64", "tar.gz"), dest, token, unwrap: false)},
};
if(_tools.TryGetValue(platform, out Func<string, Task> download)) {
await download(Path.Combine(externalsPath, name, version));
Expand Down
Loading
Loading