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: [PATCH] travis, build: further maven and gpg refinements
---
.travis.yml | 13 +++++++------
build/ci.go | 16 ++++++++--------
build/mvn.settings | 2 +-
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e2d811411..c29344f0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,14 +67,10 @@ matrix:
- go run build/ci.go install
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
- # Build the iOS framework and upload it to CocoaPods and Azure
- - gem uninstall cocoapods -a
- - gem install cocoapods --pre
- - travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
-
# Build the Android archive and upload it to Maven Central and Azure
- brew update
- - brew install android-sdk maven
+ - brew install android-sdk maven gpg
+ - alias gpg="gpg2"
- export ANDROID_HOME=/usr/local/opt/android-sdk
- mkdir -p $ANDROID_HOME/platforms
@@ -84,6 +80,11 @@ matrix:
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
- mv -f $ANDROID_HOME/platforms $HOME/.android.platforms
+ # Build the iOS framework and upload it to CocoaPods and Azure
+ - gem uninstall cocoapods -a
+ - gem install cocoapods --pre
+ - travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
+
install:
- go get golang.org/x/tools/cmd/cover
script:
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>
--
GitLab