From 475ae8bd93ccc9189241b6300c535aa162245dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 21 Nov 2019 16:14:31 +0200 Subject: [PATCH] build: pull in ci.go dependencies for the PPA builder --- build/ci.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build/ci.go b/build/ci.go index 018985aa1..d8d7c6590 100644 --- a/build/ci.go +++ b/build/ci.go @@ -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 {