diff options
| -rw-r--r-- | build/ci.go | 12 | ||||
| -rw-r--r-- | build/pod.podspec | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/build/ci.go b/build/ci.go index 0e1ed37ca..08e69b52f 100644 --- a/build/ci.go +++ b/build/ci.go @@ -744,7 +744,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata { continue } // Split the author and insert as a contributor - re := regexp.MustCompile("([^<]+) <(.+>)") + re := regexp.MustCompile("([^<]+) <(.+)>") parts := re.FindStringSubmatch(line) if len(parts) == 3 { contribs = append(contribs, mavenContributor{Name: parts[1], Email: parts[2]}) @@ -796,7 +796,7 @@ func doXCodeFramework(cmdline []string) { } // Prepare and upload a PodSpec to CocoaPods if *deploy != "" { - meta := newPodMetadata(env) + 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") } @@ -806,6 +806,7 @@ type podMetadata struct { Name string Version string Commit string + Archive string Contributors []podContributor } @@ -814,7 +815,7 @@ type podContributor struct { Email string } -func newPodMetadata(env build.Environment) podMetadata { +func newPodMetadata(env build.Environment, archive string) podMetadata { // Collect the list of authors from the repo root contribs := []podContributor{} if authors, err := os.Open("AUTHORS"); err == nil { @@ -828,7 +829,7 @@ func newPodMetadata(env build.Environment) podMetadata { continue } // Split the author and insert as a contributor - re := regexp.MustCompile("([^<]+) <(.+>)") + re := regexp.MustCompile("([^<]+) <(.+)>") parts := re.FindStringSubmatch(line) if len(parts) == 3 { contribs = append(contribs, podContributor{Name: parts[1], Email: parts[2]}) @@ -841,7 +842,8 @@ func newPodMetadata(env build.Environment) podMetadata { } return podMetadata{ Name: name, - Version: archiveVersion(env), + Archive: archive, + Version: build.VERSION() + "+" + env.Commit[:8], Commit: env.Commit, Contributors: contribs, } diff --git a/build/pod.podspec b/build/pod.podspec index c43af3e82..a1799ecc3 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -14,9 +14,9 @@ Pod::Spec.new do |spec| spec.ios.vendored_frameworks = 'Frameworks/Geth.framework' spec.prepare_command = <<-CMD - curl https://gethstore.blob.core.windows.net/builds/geth-ios-all-{{.Version}}.tar.gz | tar -xvz + curl https://gethstore.blob.core.windows.net/builds/{{.Archive}}.tar.gz | tar -xvz mkdir Frameworks - mv geth-ios-all-{{.Version}}/Geth.framework Frameworks - rm -rf geth-ios-all-{{.Version}} + mv {{.Archive}}/Geth.framework Frameworks + rm -rf {{.Archive}} CMD end |