aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-15 15:49:00 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-11-15 15:49:00 +0800
commitdfd2c605091fb14673482a820bcda412590c764e (patch)
treeef1634b0972b2672d90e6d126d585d2026b10993
parentbd0aafb4fd76b04d539d9a2891984f0c848ba09c (diff)
downloadgo-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar.gz
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar.bz2
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar.lz
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar.xz
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.tar.zst
go-tangerine-dfd2c605091fb14673482a820bcda412590c764e.zip
travis, build: fix mobile build issues on travis
-rw-r--r--.travis.yml1
-rw-r--r--build/mvn.settings2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 44f3d5507..e2d811411 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,6 +68,7 @@ matrix:
- 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
diff --git a/build/mvn.settings b/build/mvn.settings
index 406b409b9..8d06c048e 100644
--- a/build/mvn.settings
+++ b/build/mvn.settings
@@ -16,7 +16,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <gpg.executable>gpg</gpg.executable>
+ <gpg.executable>gpg2</gpg.executable>
<gpg.passphrase></gpg.passphrase>
</properties>
</profile>