From 2f9f2cbb1984e175d969865cbb7234c0ab970f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 2 Nov 2016 19:36:48 +0200 Subject: [PATCH] travis, build: enable 386 builds too for linux and osx --- .travis.yml | 9 ++++++-- build/ci.go | 66 +++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed768bfbb..eba836695 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,11 @@ matrix: go: 1.7 env: - ubuntu-ppa - - azure-linux-amd64 + - azure-linux addons: apt: packages: + - gcc-multilib - devscripts - debhelper - dput @@ -34,15 +35,19 @@ matrix: - go run build/ci.go debsrc -signer "Felix Lange (Geth CI Testing Key) " -upload ppa:lp-fjl/geth-ci-testing - go run build/ci.go install - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds + - go run build/ci.go install -arch 386 + - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds # This builder does the OSX Azure uploads - os: osx go: 1.7 env: - - azure-osx-amd64 + - azure-osx script: - go run build/ci.go install - go run build/ci.go archive -type zip -signer OSX_SIGNING_KEY -upload gethstore/builds + - go run build/ci.go install -arch 386 + - go run build/ci.go archive -arch 386 -type zip -signer OSX_SIGNING_KEY -upload gethstore/builds install: - go get golang.org/x/tools/cmd/cover diff --git a/build/ci.go b/build/ci.go index 1a7cf6f08..910de6d60 100644 --- a/build/ci.go +++ b/build/ci.go @@ -23,12 +23,12 @@ Usage: go run ci.go Available commands are: - install [ packages... ] -- builds packages and executables - test [ -coverage ] [ -vet ] [ packages... ] -- runs the tests - archive [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts - importkeys -- imports signing keys from env - debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package - xgo [ options ] -- cross builds according to options + install [-arch architecture] [ packages... ] -- builds packages and executables + test [ -coverage ] [ -vet ] [ packages... ] -- runs the tests + archive [-arch architecture] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts + importkeys -- imports signing keys from env + debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package + xgo [ options ] -- cross builds according to options For all commands, -n prevents execution of external programs (dry run mode). @@ -40,6 +40,8 @@ import ( "encoding/base64" "flag" "fmt" + "go/parser" + "go/token" "io/ioutil" "log" "os" @@ -130,6 +132,9 @@ func main() { // Compiling func doInstall(cmdline []string) { + var ( + arch = flag.String("arch", "", "Architecture to cross build for") + ) flag.CommandLine.Parse(cmdline) env := build.Env() @@ -146,11 +151,38 @@ func doInstall(cmdline []string) { if flag.NArg() > 0 { packages = flag.Args() } - - goinstall := goTool("install", buildFlags(env)...) + if *arch == "" || *arch == runtime.GOARCH { + goinstall := goTool("install", buildFlags(env)...) + goinstall.Args = append(goinstall.Args, "-v") + goinstall.Args = append(goinstall.Args, packages...) + build.MustRun(goinstall) + return + } + // Seems we are cross compiling, work around forbidden GOBIN + goinstall := goToolArch(*arch, "install", buildFlags(env)...) goinstall.Args = append(goinstall.Args, "-v") + goinstall.Args = append(goinstall.Args, []string{"-buildmode", "archive"}...) goinstall.Args = append(goinstall.Args, packages...) build.MustRun(goinstall) + + if cmds, err := ioutil.ReadDir("cmd"); err == nil { + for _, cmd := range cmds { + pkgs, err := parser.ParseDir(token.NewFileSet(), filepath.Join(".", "cmd", cmd.Name()), nil, parser.PackageClauseOnly) + if err != nil { + log.Fatal(err) + } + for name, _ := range pkgs { + if name == "main" { + gobuild := goToolArch(*arch, "build", buildFlags(env)...) + gobuild.Args = append(gobuild.Args, "-v") + gobuild.Args = append(gobuild.Args, []string{"-o", filepath.Join(GOBIN, cmd.Name())}...) + gobuild.Args = append(gobuild.Args, "."+string(filepath.Separator)+filepath.Join("cmd", cmd.Name())) + build.MustRun(gobuild) + break + } + } + } + } } func buildFlags(env build.Environment) (flags []string) { @@ -173,13 +205,22 @@ func buildFlags(env build.Environment) (flags []string) { } func goTool(subcmd string, args ...string) *exec.Cmd { + return goToolArch(runtime.GOARCH, subcmd, args...) +} + +func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd { gocmd := filepath.Join(runtime.GOROOT(), "bin", "go") cmd := exec.Command(gocmd, subcmd) cmd.Args = append(cmd.Args, args...) cmd.Env = []string{ "GO15VENDOREXPERIMENT=1", "GOPATH=" + build.GOPATH(), - "GOBIN=" + GOBIN, + } + if arch == "" || arch == runtime.GOARCH { + cmd.Env = append(cmd.Env, "GOBIN="+GOBIN) + } else { + cmd.Env = append(cmd.Env, "CGO_ENABLED=1") + cmd.Env = append(cmd.Env, "GOARCH="+arch) } for _, e := range os.Environ() { if strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "GOBIN=") { @@ -239,6 +280,7 @@ func doTest(cmdline []string) { func doArchive(cmdline []string) { var ( + arch = flag.String("arch", runtime.GOARCH, "Architecture cross packaging") atype = flag.String("type", "zip", "Type of archive to write (zip|tar)") signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. LINUX_SIGNING_KEY)`) upload = flag.String("upload", "", `Destination to upload the archives (usually "gethstore/builds")`) @@ -257,7 +299,7 @@ func doArchive(cmdline []string) { env := build.Env() maybeSkipArchive(env) - base := archiveBasename(env) + base := archiveBasename(*arch, env) if err := build.WriteArchive("geth-"+base, ext, gethArchiveFiles); err != nil { log.Fatal(err) } @@ -272,9 +314,9 @@ func doArchive(cmdline []string) { } } -func archiveBasename(env build.Environment) string { +func archiveBasename(arch string, env build.Environment) string { // date := time.Now().UTC().Format("200601021504") - platform := runtime.GOOS + "-" + runtime.GOARCH + platform := runtime.GOOS + "-" + arch archive := platform + "-" + build.VERSION() if env.Commit != "" { archive += "-" + env.Commit[:8]