From 28061efeea48a46393000c53a8e46ac82a890e2b Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Fri, 15 May 2015 17:19:15 -0700 Subject: [PATCH] sets default build timeout --- runner/builtin/runner.go | 3 ++- server/repos.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/runner/builtin/runner.go b/runner/builtin/runner.go index d08524b12..a8c3ef9c7 100644 --- a/runner/builtin/runner.go +++ b/runner/builtin/runner.go @@ -120,7 +120,8 @@ func (r *Runner) Run(w *queue.Work) error { if err != nil { return err } - worker := newWorkerTimeout(client, w.Repo.Timeout+10) // 10 minute buffer + + worker := newWorkerTimeout(client, w.Repo.Timeout) workers = append(workers, worker) cname := cname(task) state, builderr := worker.Build(cname, in) diff --git a/server/repos.go b/server/repos.go index c175176b5..660ba33f8 100644 --- a/server/repos.go +++ b/server/repos.go @@ -210,6 +210,7 @@ func PostRepo(c *gin.Context) { r.UserID = user.ID r.PostCommit = true r.PullRequest = true + r.Timeout = 60 // 1 hour default build time r.Self = fmt.Sprintf( "%s/%s", httputil.GetURL(c.Request),