travis: dash of black magic to summon the cache daemon (#3288)

This commit is contained in:
Péter Szilágyi 2016-11-17 17:15:17 +02:00 committed by Jeffrey Wilcke
parent 87b8254da1
commit f3228592f5
2 changed files with 9 additions and 11 deletions

View File

@ -59,10 +59,6 @@ matrix:
env: env:
- azure-osx - azure-osx
- mobile - mobile
cache:
directories:
- $HOME/.android.platforms
- $HOME/.cocoapods
script: script:
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
@ -71,21 +67,24 @@ matrix:
- brew update - brew update
- brew install android-sdk maven gpg - brew install android-sdk maven gpg
- alias gpg="gpg2" - alias gpg="gpg2"
- export ANDROID_HOME=/usr/local/opt/android-sdk
- mkdir -p $ANDROID_HOME/platforms - export ANDROID_HOME=/usr/local/opt/android-sdk
- mv -f $HOME/.android.platforms $ANDROID_HOME/platforms
- echo "y" | android update sdk --no-ui --filter `android list sdk | grep "SDK Platform Android" | grep -E 'API 15|API 19|API 24' | awk '{print $1}' | cut -d '-' -f 1 | tr '\n' ','` - echo "y" | android update sdk --no-ui --filter `android list sdk | grep "SDK Platform Android" | grep -E 'API 15|API 19|API 24' | awk '{print $1}' | cut -d '-' -f 1 | tr '\n' ','`
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds - 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 # Build the iOS framework and upload it to CocoaPods and Azure
- gem uninstall cocoapods -a - gem uninstall cocoapods -a
- gem install cocoapods --pre - gem install cocoapods --pre
- mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
- sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi
- xctool -version - xctool -version
- xcrun simctl list - xcrun simctl list
- travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
install: install:
- go get golang.org/x/tools/cmd/cover - go get golang.org/x/tools/cmd/cover

View File

@ -777,7 +777,6 @@ func doXCodeFramework(cmdline []string) {
// Build the iOS XCode framework // Build the iOS XCode framework
build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile"))
build.MustRun(gomobileTool("init"))
archive := "geth-" + archiveBasename("ios", env) archive := "geth-" + archiveBasename("ios", env)
if err := os.Mkdir(archive, os.ModePerm); err != nil { if err := os.Mkdir(archive, os.ModePerm); err != nil {
@ -799,7 +798,7 @@ func doXCodeFramework(cmdline []string) {
if *deploy != "" { if *deploy != "" {
meta := newPodMetadata(env) meta := newPodMetadata(env)
build.Render("build/pod.podspec", meta.Name+".podspec", 0755, meta) build.Render("build/pod.podspec", meta.Name+".podspec", 0755, meta)
build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings") build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings", "--verbose")
} }
} }