Skip to content

Commit f322859

Browse files
karalabeobscuren
authored andcommitted
travis: dash of black magic to summon the cache daemon (#3288)
1 parent 87b8254 commit f322859

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ matrix:
5959
env:
6060
- azure-osx
6161
- mobile
62-
cache:
63-
directories:
64-
- $HOME/.android.platforms
65-
- $HOME/.cocoapods
6662
script:
6763
- go run build/ci.go install
6864
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
@@ -71,21 +67,24 @@ matrix:
7167
- brew update
7268
- brew install android-sdk maven gpg
7369
- alias gpg="gpg2"
74-
- export ANDROID_HOME=/usr/local/opt/android-sdk
7570

76-
- mkdir -p $ANDROID_HOME/platforms
77-
- mv -f $HOME/.android.platforms $ANDROID_HOME/platforms
71+
- export ANDROID_HOME=/usr/local/opt/android-sdk
7872
- 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' ','`
7973

8074
- go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
81-
- mv -f $ANDROID_HOME/platforms $HOME/.android.platforms
8275

8376
# Build the iOS framework and upload it to CocoaPods and Azure
8477
- gem uninstall cocoapods -a
8578
- gem install cocoapods --pre
79+
80+
- mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
81+
- sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb
82+
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi
83+
8684
- xctool -version
8785
- xcrun simctl list
88-
- travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
86+
87+
- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
8988

9089
install:
9190
- go get golang.org/x/tools/cmd/cover

build/ci.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ func doXCodeFramework(cmdline []string) {
777777

778778
// Build the iOS XCode framework
779779
build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile"))
780-
build.MustRun(gomobileTool("init"))
781780

782781
archive := "geth-" + archiveBasename("ios", env)
783782
if err := os.Mkdir(archive, os.ModePerm); err != nil {
@@ -799,7 +798,7 @@ func doXCodeFramework(cmdline []string) {
799798
if *deploy != "" {
800799
meta := newPodMetadata(env)
801800
build.Render("build/pod.podspec", meta.Name+".podspec", 0755, meta)
802-
build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings")
801+
build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings", "--verbose")
803802
}
804803
}
805804

0 commit comments

Comments
 (0)