aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-15 16:25:51 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-11-15 16:25:51 +0800
commit2cb9738649f06fe9bec6b4d5daec92ae0fef0982 (patch)
tree9de61185fffd487babd80f9aeb61ea5d397d14b7 /build
parentdfd2c605091fb14673482a820bcda412590c764e (diff)
downloadgo-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar.gz
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar.bz2
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar.lz
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar.xz
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.tar.zst
go-tangerine-2cb9738649f06fe9bec6b4d5daec92ae0fef0982.zip
travis, build: further maven and gpg refinements
Diffstat (limited to 'build')
-rw-r--r--build/ci.go16
-rw-r--r--build/mvn.settings2
2 files changed, 9 insertions, 9 deletions
diff --git a/build/ci.go b/build/ci.go
index e8e08268b..9d1543ea4 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -672,8 +672,15 @@ func doAndroidArchive(cmdline []string) {
// Skip Maven deploy and Azure upload for PR builds
maybeSkipArchive(env)
+ // Sign and upload the archive to Azure
+ archive := "geth-" + archiveBasename("android", env) + ".aar"
+ os.Rename("geth.aar", archive)
+
+ if err := archiveUpload(archive, *upload, *signer); err != nil {
+ log.Fatal(err)
+ }
// Sign and upload all the artifacts to Maven Central
- os.Rename("geth.aar", meta.Package+".aar")
+ os.Rename(archive, meta.Package+".aar")
if *signer != "" && *deploy != "" {
// Import the signing key into the local GPG instance
if b64key := os.Getenv(*signer); b64key != "" {
@@ -694,13 +701,6 @@ func doAndroidArchive(cmdline []string) {
"-settings=build/mvn.settings", "-Durl="+repo, "-DrepositoryId=ossrh",
"-DpomFile="+meta.Package+".pom", "-Dfile="+meta.Package+".aar")
}
- // Sign and upload the archive to Azure
- archive := "geth-" + archiveBasename("android", env) + ".aar"
- os.Rename(meta.Package+".aar", archive)
-
- if err := archiveUpload(archive, *upload, *signer); err != nil {
- log.Fatal(err)
- }
}
func gomobileTool(subcmd string, args ...string) *exec.Cmd {
diff --git a/build/mvn.settings b/build/mvn.settings
index 8d06c048e..406b409b9 100644
--- a/build/mvn.settings
+++ b/build/mvn.settings
@@ -16,7 +16,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <gpg.executable>gpg2</gpg.executable>
+ <gpg.executable>gpg</gpg.executable>
<gpg.passphrase></gpg.passphrase>
</properties>
</profile>