diff --git a/common/lib/dependabot/command_helpers.rb b/common/lib/dependabot/command_helpers.rb index f10aeff67b..9d87095270 100644 --- a/common/lib/dependabot/command_helpers.rb +++ b/common/lib/dependabot/command_helpers.rb @@ -11,11 +11,11 @@ module CommandHelpers extend T::Sig module TIMEOUTS - NO_TIME_OUT = -1 - LOCAL = 30 - NETWORK = 120 - LONG_RUNNING = 300 - DEFAULT = NETWORK + NO_TIME_OUT = -1 # No timeout + LOCAL = 30 # 30 seconds + NETWORK = 120 # 2 minutes + LONG_RUNNING = 300 # 5 minutes + DEFAULT = 900 # 15 minutes end class ProcessStatus diff --git a/common/lib/dependabot/shared_helpers.rb b/common/lib/dependabot/shared_helpers.rb index 650c913ae8..f7d3bc0ec3 100644 --- a/common/lib/dependabot/shared_helpers.rb +++ b/common/lib/dependabot/shared_helpers.rb @@ -453,7 +453,7 @@ def self.run_shell_command(command, env_cmd = [env || {}, cmd, opts].compact if Experiments.enabled?(:enable_shared_helpers_command_timeout) - stdout, stderr, process, _elapsed_time = CommandHelpers.capture3_with_timeout( + stdout, stderr, process = CommandHelpers.capture3_with_timeout( env_cmd, stderr_to_stdout: stderr_to_stdout, timeout: timeout