Remove async pre-empt hack if go >= 1.15 (#12718)
Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
		
							parent
							
								
									482b0e6d47
								
							
						
					
					
						commit
						bda9e51fef
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		|  | @ -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 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue