diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-11-28 19:28:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 19:28:02 +0800 |
| commit | ba41efa8a0365912ab26b24cb4ac46153e774d4f (patch) | |
| tree | f1d110fc06d2b7cf60db51439d6c89407b56775b | |
| parent | 665bb43a4c9e97d6f23de02575b92156881a2db8 (diff) | |
| parent | f81660b6db9c4dfef54ab353bf8b5b1e627d34c9 (diff) | |
| download | dexon-ba41efa8a0365912ab26b24cb4ac46153e774d4f.tar.gz dexon-ba41efa8a0365912ab26b24cb4ac46153e774d4f.tar.zst dexon-ba41efa8a0365912ab26b24cb4ac46153e774d4f.zip | |
Merge pull request #3362 from karalabe/cocoapods-fix-3000
build: use single CocoaPods package, pre-release dev builds
| -rw-r--r-- | build/ci.go | 12 | ||||
| -rw-r--r-- | build/pod.podspec | 2 |
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' |