From 98f3245e1e7238fbe1f1d68cb740be9077a4e03c Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Mon, 30 Mar 2020 17:21:52 +0200 Subject: [PATCH 1/2] Bump default action timeout from 2min to 15min This fixes #159. I think we could (should?) go even higher, since most of the actions I ran take their time, especially on macOS. --- cmd/src/actions_exec.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/src/actions_exec.go b/cmd/src/actions_exec.go index 8012dca1ed..1d26bf9120 100644 --- a/cmd/src/actions_exec.go +++ b/cmd/src/actions_exec.go @@ -52,7 +52,7 @@ func userCacheDir() (string, error) { return filepath.Join(userCacheDir, "sourcegraph-src"), nil } -const defaultTimeout = 2 * time.Minute +const defaultTimeout = 15 * time.Minute func init() { usage := ` @@ -139,7 +139,7 @@ Format of the action JSON files: clearCacheFlag = flagSet.Bool("clear-cache", false, "Remove possibly cached results for an action before executing it.") keepLogsFlag = flagSet.Bool("keep-logs", false, "Do not remove execution log files when done.") - timeoutFlag = flagSet.Duration("timeout", defaultTimeout, "The maximum duration a single action run can take (excluding the building of Docker images).") + timeoutFlag = flagSet.Duration("timeout", defaultTimeout, "The maximum duration a single action run can take.") createPatchSetFlag = flagSet.Bool("create-patchset", false, "Create a patch set from the produced set of patches. When the execution of the action fails in a single repository a prompt will ask to confirm or reject the patch set creation.") forceCreatePatchSetFlag = flagSet.Bool("force-create-patchset", false, "Force creation of patch set from the produced set of patches, without asking for confirmation even when the execution of the action failed for a subset of repositories.") From 7ae803e2468b52af07980372d3d6f5ca3ba097c2 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Mon, 30 Mar 2020 17:29:37 +0200 Subject: [PATCH 2/2] Increase timeout to 60min --- cmd/src/actions_exec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/src/actions_exec.go b/cmd/src/actions_exec.go index 1d26bf9120..43cb37f251 100644 --- a/cmd/src/actions_exec.go +++ b/cmd/src/actions_exec.go @@ -52,7 +52,7 @@ func userCacheDir() (string, error) { return filepath.Join(userCacheDir, "sourcegraph-src"), nil } -const defaultTimeout = 15 * time.Minute +const defaultTimeout = 60 * time.Minute func init() { usage := `