Merge pull request #20356 from karalabe/ppa-fix-cigo

build: pull in ci.go dependencies for the PPA builder
This commit is contained in:
Péter Szilágyi 2019-11-21 16:24:07 +02:00 committed by GitHub
commit 0754100464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -501,10 +501,14 @@ func doDebianSource(cmdline []string) {
// Download and verify the Go source package.
gobundle := downloadGoSources(*goversion, *cachedir)
// Download all the dependencies needed to build the sources
depfetch := goTool("install", "-n", "./...")
depfetch.Env = append(os.Environ(), "GOPATH="+filepath.Join(*workdir, "modgopath"))
build.MustRun(depfetch)
// Download all the dependencies needed to build the sources and run the ci script
srcdepfetch := goTool("install", "-n", "./...")
srcdepfetch.Env = append(os.Environ(), "GOPATH="+filepath.Join(*workdir, "modgopath"))
build.MustRun(srcdepfetch)
cidepfetch := goTool("run", "./build/ci.go")
cidepfetch.Env = append(os.Environ(), "GOPATH="+filepath.Join(*workdir, "modgopath"))
cidepfetch.Run() // Command fails, don't care, we only need the deps to start it
// Create Debian packages and upload them.
for _, pkg := range debPackages {