aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git/command.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/git/command.go')
-rw-r--r--modules/git/command.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/git/command.go b/modules/git/command.go
index 1496b0186e..2a00a0a203 100644
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -11,10 +11,12 @@ import (
"io"
"os"
"os/exec"
+ "runtime"
"strings"
"time"
"code.gitea.io/gitea/modules/process"
+ "github.com/mcuadros/go-version"
)
var (
@@ -130,7 +132,9 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
}
// TODO: verify if this is still needed in golang 1.15
- cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")
+ if version.Compare(runtime.Version(), "go1.15", "<") {
+ cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")
+ }
cmd.Dir = dir
cmd.Stdout = stdout
cmd.Stderr = stderr