diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-11-15 15:50:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 15:50:47 +0800 |
| commit | 0dc590a9f8182d9faba7fee0001bf243637bd9b3 (patch) | |
| tree | ef1634b0972b2672d90e6d126d585d2026b10993 | |
| parent | bd0aafb4fd76b04d539d9a2891984f0c848ba09c (diff) | |
| parent | dfd2c605091fb14673482a820bcda412590c764e (diff) | |
| download | go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar.gz go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar.bz2 go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar.lz go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar.xz go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.tar.zst go-tangerine-0dc590a9f8182d9faba7fee0001bf243637bd9b3.zip | |
Merge pull request #3262 from karalabe/travis-cocoapods-gpg2
travis, build: fix mobile build issues on travis
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | build/mvn.settings | 2 |
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> |