From bcac4557a0894875f85d294b3e7147c2ee0065c4 Mon Sep 17 00:00:00 2001 From: Eilon Lipton Date: Wed, 6 Nov 2019 05:47:56 -0800 Subject: [PATCH] Fix Runner.Worker build warnings (#174) Most of these warnings show up on only certain build OSes because of #ifdefs in the code. The fix is to suppress these warnings. --- src/Runner.Worker/ActionCommandManager.cs | 1 - src/Runner.Worker/Container/DockerCommandManager.cs | 6 ++++++ src/Runner.Worker/DiagnosticLogManager.cs | 2 ++ src/Runner.Worker/Handlers/ContainerActionHandler.cs | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Runner.Worker/ActionCommandManager.cs b/src/Runner.Worker/ActionCommandManager.cs index a1a268d60..2e2e6af1e 100644 --- a/src/Runner.Worker/ActionCommandManager.cs +++ b/src/Runner.Worker/ActionCommandManager.cs @@ -541,7 +541,6 @@ namespace GitHub.Runner.Worker break; default: throw new Exception($"Invalid echo command value. Possible values can be: 'on', 'off'. Current value is: '{command.Data}'."); - break; } } } diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 555cdefcf..ad9c074c4 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -276,7 +276,9 @@ namespace GitHub.Runner.Worker.Container return await ExecuteDockerCommandAsync(context, "exec", $"{options} {containerId} {command}", context.CancellationToken); } +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms) public async Task DockerExec(IExecutionContext context, string containerId, string options, string command, List output) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { ArgUtil.NotNull(output, nameof(output)); @@ -337,7 +339,9 @@ namespace GitHub.Runner.Worker.Container return ExecuteDockerCommandAsync(context, command, options, null, cancellationToken); } +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms) private async Task ExecuteDockerCommandAsync(IExecutionContext context, string command, string options, IDictionary environment, EventHandler stdoutDataReceived, EventHandler stderrDataReceived, CancellationToken cancellationToken = default(CancellationToken)) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { string arg = $"{command} {options}".Trim(); context.Command($"{DockerPath} {arg}"); @@ -362,7 +366,9 @@ namespace GitHub.Runner.Worker.Container #endif } +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms) private async Task ExecuteDockerCommandAsync(IExecutionContext context, string command, string options, string workingDirectory, CancellationToken cancellationToken = default(CancellationToken)) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { string arg = $"{command} {options}".Trim(); context.Command($"{DockerPath} {arg}"); diff --git a/src/Runner.Worker/DiagnosticLogManager.cs b/src/Runner.Worker/DiagnosticLogManager.cs index 5e84aa9fa..809cecdee 100644 --- a/src/Runner.Worker/DiagnosticLogManager.cs +++ b/src/Runner.Worker/DiagnosticLogManager.cs @@ -31,7 +31,9 @@ namespace GitHub.Runner.Worker public sealed class DiagnosticLogManager : RunnerService, IDiagnosticLogManager { private static string DateTimeFormat = "yyyyMMdd-HHmmss"; +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms) public async Task UploadDiagnosticLogsAsync(IExecutionContext executionContext, +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously IExecutionContext parentContext, Pipelines.AgentJobRequestMessage message, DateTime jobStartTimeUtc) diff --git a/src/Runner.Worker/Handlers/ContainerActionHandler.cs b/src/Runner.Worker/Handlers/ContainerActionHandler.cs index 53be0ce27..2a91a1a42 100644 --- a/src/Runner.Worker/Handlers/ContainerActionHandler.cs +++ b/src/Runner.Worker/Handlers/ContainerActionHandler.cs @@ -22,7 +22,9 @@ namespace GitHub.Runner.Worker.Handlers { public ContainerActionExecutionData Data { get; set; } +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously (method has async logic on only certain platforms) public async Task RunAsync(ActionRunStage stage) +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously { // Validate args. Trace.Entering();