aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-28 18:56:13 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-11-28 19:09:43 +0800
commitf81660b6db9c4dfef54ab353bf8b5b1e627d34c9 (patch)
treef1d110fc06d2b7cf60db51439d6c89407b56775b
parent665bb43a4c9e97d6f23de02575b92156881a2db8 (diff)
downloaddexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar.gz
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar.bz2
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar.lz
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar.xz
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.tar.zst
dexon-f81660b6db9c4dfef54ab353bf8b5b1e627d34c9.zip
build: use single CocoaPods package, pre-release dev builds
-rw-r--r--build/ci.go12
-rw-r--r--build/pod.podspec2
2 files changed, 6 insertions, 8 deletions
diff --git a/build/ci.go b/build/ci.go
index 29c4b8b33..c202480b2 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -826,13 +826,12 @@ func doXCodeFramework(cmdline []string) {
// Prepare and upload a PodSpec to CocoaPods
if *deploy != "" {
meta := newPodMetadata(env, archive)
- build.Render("build/pod.podspec", meta.Name+".podspec", 0755, meta)
- build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings", "--verbose")
+ build.Render("build/pod.podspec", "Geth.podspec", 0755, meta)
+ build.MustRunCommand("pod", *deploy, "push", "Geth.podspec", "--allow-warnings", "--verbose")
}
}
type podMetadata struct {
- Name string
Version string
Commit string
Archive string
@@ -865,14 +864,13 @@ func newPodMetadata(env build.Environment, archive string) podMetadata {
}
}
}
- name := "Geth"
+ version := build.VERSION()
if isUnstableBuild(env) {
- name += "Develop"
+ version += "-unstable." + env.Buildnum
}
return podMetadata{
- Name: name,
Archive: archive,
- Version: build.VERSION(),
+ Version: version,
Commit: env.Commit,
Contributors: contribs,
}
diff --git a/build/pod.podspec b/build/pod.podspec
index a1799ecc3..2c14c280c 100644
--- a/build/pod.podspec
+++ b/build/pod.podspec
@@ -1,5 +1,5 @@
Pod::Spec.new do |spec|
- spec.name = '{{.Name}}'
+ spec.name = 'Geth'
spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' }
spec.homepage = 'https://github.com/ethereum/go-ethereum'