diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/ci.go | 20 | ||||
| -rwxr-xr-x | build/env.sh | 1 | ||||
| -rw-r--r-- | build/update-license.go | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/build/ci.go b/build/ci.go index 910de6d60..c6c6f61c9 100644 --- a/build/ci.go +++ b/build/ci.go @@ -296,18 +296,20 @@ func doArchive(cmdline []string) { log.Fatal("unknown archive type: ", atype) } - env := build.Env() + var ( + env = build.Env() + base = archiveBasename(*arch, env) + geth = "geth-" + base + ext + alltools = "geth-alltools-" + base + ext + ) maybeSkipArchive(env) - - base := archiveBasename(*arch, env) - if err := build.WriteArchive("geth-"+base, ext, gethArchiveFiles); err != nil { + if err := build.WriteArchive(geth, gethArchiveFiles); err != nil { log.Fatal(err) } - if err := build.WriteArchive("geth-alltools-"+base, ext, allToolsArchiveFiles); err != nil { + if err := build.WriteArchive(alltools, allToolsArchiveFiles); err != nil { log.Fatal(err) } - - for _, archive := range []string{"geth-" + base + ext, "geth-alltools-" + base + ext} { + for _, archive := range []string{geth, alltools} { if err := archiveUpload(archive, *upload, *signer); err != nil { log.Fatal(err) } @@ -315,9 +317,11 @@ func doArchive(cmdline []string) { } func archiveBasename(arch string, env build.Environment) string { - // date := time.Now().UTC().Format("200601021504") platform := runtime.GOOS + "-" + arch archive := platform + "-" + build.VERSION() + if isUnstableBuild(env) { + archive += "-unstable" + } if env.Commit != "" { archive += "-" + env.Commit[:8] } diff --git a/build/env.sh b/build/env.sh index c418dae44..3914555d1 100755 --- a/build/env.sh +++ b/build/env.sh @@ -19,7 +19,6 @@ if [ ! -L "$ethdir/go-ethereum" ]; then fi # Set up the environment to use the workspace. -# Also add Godeps workspace so we build using canned dependencies. GOPATH="$workspace" export GOPATH diff --git a/build/update-license.go b/build/update-license.go index 96667be15..94b319550 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -45,7 +45,7 @@ var ( // paths with any of these prefixes will be skipped skipPrefixes = []string{ // boring stuff - "Godeps/", "tests/files/", "build/", + "vendor/", "tests/files/", "build/", // don't relicense vendored sources "crypto/sha3/", "crypto/ecies/", "logger/glog/", "crypto/secp256k1/curve.go", |