mirror/go-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/go-pulse.git synced 2024-12-22 19:40:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: mobile CI fixes (#3322)

Browse Source 
* build: use metatags on cocoapods, not prerelease tags
* build: fix Maven and CocoaPods author email addresses
This commit is contained in:
Péter Szilágyi 2016-11-22 18:35:49 +02:00 committed by Felix Lange
parent 2c802399c3
commit a0e42aa4e2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/ci.go
View File

@ -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,
}

6
build/pod.podspec
View File

@ -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