Merge pull request #981 from github/build-all-temp-env

Build all temp env
This commit is contained in:
risk danger olson 2016-02-05 13:47:13 -09:00
commit 69d14194a6

@ -143,12 +143,7 @@ func buildCommand(dir, buildos, buildarch string) error {
cmd := exec.Command("go", args...)
if addenv {
cmd.Env = []string{
"GOOS=" + buildos,
"GOARCH=" + buildarch,
"GOPATH=" + os.Getenv("GOPATH"),
"GOROOT=" + os.Getenv("GOROOT"),
}
cmd.Env = buildGoEnv(buildos, buildarch)
}
output, err := cmd.CombinedOutput()
@ -158,6 +153,22 @@ func buildCommand(dir, buildos, buildarch string) error {
return err
}
func buildGoEnv(buildos, buildarch string) []string {
env := make([]string, 4, 7)
env[0] = "GOOS=" + buildos
env[1] = "GOARCH=" + buildarch
env[2] = "GOPATH=" + os.Getenv("GOPATH")
env[3] = "GOROOT=" + os.Getenv("GOROOT")
for _, key := range []string{"TMP", "TEMP", "TEMPDIR"} {
v := os.Getenv(key)
if len(v) == 0 {
continue
}
env = append(env, key+"="+v)
}
return env
}
func setupInstaller(buildos, buildarch, dir string, buildMatrix map[string]Release) error {
textfiles := []string{
"README.md", "CHANGELOG.md",