forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/ci: remove redundant variables

Browse source
This commit is contained in:
Anton Evangelatov 2018-07-19 17:07:16 +02:00
parent 9ad8e09ca2
commit 4efca87c70
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
build/ci.go
View file

@ -62,9 +62,6 @@ import (
) )
var ( var (
gethVersionFile = "VERSION"
swarmVersionFile = "swarm/VERSION"
// Files that end up in the geth*.zip archive. // Files that end up in the geth*.zip archive.
gethArchiveFiles = []string{ gethArchiveFiles = []string{
"COPYING", "COPYING",
@ -89,8 +86,6 @@ var (
executablePath("swarm"), executablePath("swarm"),
} }
swarmPackageName = "ethereum-swarm"
// A debian package is created for all executables listed here. // A debian package is created for all executables listed here.
debExecutables = []debExecutable{ debExecutables = []debExecutable{
{ {
@ -127,23 +122,23 @@ var (
debSwarmExecutables = []debExecutable{ debSwarmExecutables = []debExecutable{
{ {
BinaryName: "swarm", BinaryName: "swarm",
PackageName: swarmPackageName, PackageName: "ethereum-swarm",
Description: "Ethereum Swarm daemon and tools", Description: "Ethereum Swarm daemon and tools",
}, },
} }
debSwarm = debPackage{
Name: swarmPackageName,
VersionFilePath: "swarm/VERSION",
Executables: debSwarmExecutables,
}
debEthereum = debPackage{ debEthereum = debPackage{
Name: "ethereum", Name: "ethereum",
VersionFilePath: "VERSION", VersionFilePath: "VERSION",
Executables: debExecutables, Executables: debExecutables,
} }
debSwarm = debPackage{
Name: "ethereum-swarm",
VersionFilePath: "swarm/VERSION",
Executables: debSwarmExecutables,
}
// Debian meta packages to build and push to Ubuntu PPA // Debian meta packages to build and push to Ubuntu PPA
debPackages = []debPackage{ debPackages = []debPackage{
debSwarm, debSwarm,
@ -405,11 +400,11 @@ func doArchive(cmdline []string) {
var ( var (
env = build.Env() env = build.Env()
basegeth = archiveBasename(*arch, env, gethVersionFile) basegeth = archiveBasename(*arch, env, debEthereum.VersionFilePath)
geth = "geth-" + basegeth + ext geth = "geth-" + basegeth + ext
alltools = "geth-alltools-" + basegeth + ext alltools = "geth-alltools-" + basegeth + ext
baseswarm = archiveBasename(*arch, env, swarmVersionFile) baseswarm = archiveBasename(*arch, env, debSwarm.VersionFilePath)
swarm = "swarm-" + baseswarm + ext swarm = "swarm-" + baseswarm + ext
) )
maybeSkipArchive(env) maybeSkipArchive(env)
@ -661,9 +656,9 @@ func (meta debMetadata) ExeName(exe debExecutable) string {
// depends on and installs "ethereum-swarm" // depends on and installs "ethereum-swarm"
func (meta debMetadata) EthereumSwarmPackageName() string { func (meta debMetadata) EthereumSwarmPackageName() string {
if isUnstableBuild(meta.Env) { if isUnstableBuild(meta.Env) {
return swarmPackageName + "-unstable" return debSwarm.Name + "-unstable"
} }
return swarmPackageName return debSwarm.Name
} }
// ExeConflicts returns the content of the Conflicts field // ExeConflicts returns the content of the Conflicts field
@ -761,11 +756,11 @@ func doWindowsInstaller(cmdline []string) {
// Build the installer. This assumes that all the needed files have been previously // Build the installer. This assumes that all the needed files have been previously
// built (don't mix building and packaging to keep cross compilation complexity to a // built (don't mix building and packaging to keep cross compilation complexity to a
// minimum). // minimum).
version := strings.Split(build.VERSION(gethVersionFile), ".") version := strings.Split(build.VERSION(debEthereum.VersionFilePath), ".")
if env.Commit != "" { if env.Commit != "" {
version[2] += "-" + env.Commit[:8] version[2] += "-" + env.Commit[:8]
} }
installer, _ := filepath.Abs("geth-" + archiveBasename(*arch, env, gethVersionFile) + ".exe") installer, _ := filepath.Abs("geth-" + archiveBasename(*arch, env, debEthereum.VersionFilePath) + ".exe")
build.MustRunCommand("makensis.exe", build.MustRunCommand("makensis.exe",
"/DOUTPUTFILE="+installer, "/DOUTPUTFILE="+installer,
"/DMAJORVERSION="+version[0], "/DMAJORVERSION="+version[0],
@ -817,7 +812,7 @@ func doAndroidArchive(cmdline []string) {
maybeSkipArchive(env) maybeSkipArchive(env)
// Sign and upload the archive to Azure // Sign and upload the archive to Azure
archive := "geth-" + archiveBasename("android", env, gethVersionFile) + ".aar" archive := "geth-" + archiveBasename("android", env, debEthereum.VersionFilePath) + ".aar"
os.Rename("geth.aar", archive) os.Rename("geth.aar", archive)
if err := archiveUpload(archive, *upload, *signer); err != nil { if err := archiveUpload(archive, *upload, *signer); err != nil {
@ -902,7 +897,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata {
} }
} }
// Render the version and package strings // Render the version and package strings
version := build.VERSION(gethVersionFile) version := build.VERSION(debEthereum.VersionFilePath)
if isUnstableBuild(env) { if isUnstableBuild(env) {
version += "-SNAPSHOT" version += "-SNAPSHOT"
} }
@ -937,7 +932,7 @@ func doXCodeFramework(cmdline []string) {
build.MustRun(bind) build.MustRun(bind)
return return
} }
archive := "geth-" + archiveBasename("ios", env, gethVersionFile) archive := "geth-" + archiveBasename("ios", env, debEthereum.VersionFilePath)
if err := os.Mkdir(archive, os.ModePerm); err != nil { if err := os.Mkdir(archive, os.ModePerm); err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -993,7 +988,7 @@ func newPodMetadata(env build.Environment, archive string) podMetadata {
} }
} }
} }
version := build.VERSION(gethVersionFile) version := build.VERSION(debEthereum.VersionFilePath)
if isUnstableBuild(env) { if isUnstableBuild(env) {
version += "-unstable." + env.Buildnum version += "-unstable." + env.Buildnum
} }