From 2cb9738649f06fe9bec6b4d5daec92ae0fef0982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 15 Nov 2016 10:25:51 +0200
Subject: travis, build: further maven and gpg refinements

---
 build/ci.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'build/ci.go')

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 {
-- 
cgit v1.2.3