travis, build: cocoapods build fixes and travis caches
This commit is contained in:
		@@ -59,6 +59,10 @@ 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,8 +75,13 @@ matrix:
 | 
				
			|||||||
        - brew update
 | 
					        - brew update
 | 
				
			||||||
        - brew install android-sdk maven
 | 
					        - brew install android-sdk maven
 | 
				
			||||||
        - export ANDROID_HOME=/usr/local/opt/android-sdk
 | 
					        - export ANDROID_HOME=/usr/local/opt/android-sdk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        - mkdir -p $ANDROID_HOME/platforms
 | 
				
			||||||
 | 
					        - mv -f $HOME/.android.platforms $ANDROID_HOME/platforms
 | 
				
			||||||
        - echo "y" | android update sdk --no-ui --filter platform
 | 
					        - echo "y" | android update sdk --no-ui --filter platform
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - 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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install:
 | 
					install:
 | 
				
			||||||
  - go get golang.org/x/tools/cmd/cover
 | 
					  - go get golang.org/x/tools/cmd/cover
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -799,7 +799,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")
 | 
							build.MustRunCommand("pod", *deploy, "push", meta.Name+".podspec", "--allow-warnings")
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,6 +17,6 @@ Pod::Spec.new do |spec|
 | 
				
			|||||||
    curl https://gethstore.blob.core.windows.net/builds/geth-ios-all-{{.Version}}.tar.gz | tar -xvz
 | 
					    curl https://gethstore.blob.core.windows.net/builds/geth-ios-all-{{.Version}}.tar.gz | tar -xvz
 | 
				
			||||||
    mkdir Frameworks
 | 
					    mkdir Frameworks
 | 
				
			||||||
    mv geth-ios-all-{{.Version}}/Geth.framework Frameworks
 | 
					    mv geth-ios-all-{{.Version}}/Geth.framework Frameworks
 | 
				
			||||||
    rm geth-ios-all-{{.Version}}
 | 
					    rm -rf geth-ios-all-{{.Version}}
 | 
				
			||||||
  CMD
 | 
					  CMD
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,16 +14,22 @@
 | 
				
			|||||||
// You should have received a copy of the GNU Lesser General Public License
 | 
					// You should have received a copy of the GNU Lesser General Public License
 | 
				
			||||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 | 
					// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Contains wrappers and init code for the logger.
 | 
					// Contains initialization code for the mbile library.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
package geth
 | 
					package geth
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"runtime"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/ethereum/go-ethereum/logger"
 | 
						"github.com/ethereum/go-ethereum/logger"
 | 
				
			||||||
	"github.com/ethereum/go-ethereum/logger/glog"
 | 
						"github.com/ethereum/go-ethereum/logger/glog"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func init() {
 | 
					func init() {
 | 
				
			||||||
 | 
						// Initialize the logger
 | 
				
			||||||
	glog.SetV(logger.Info)
 | 
						glog.SetV(logger.Info)
 | 
				
			||||||
	glog.SetToStderr(true)
 | 
						glog.SetToStderr(true)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Initialize the goroutine count
 | 
				
			||||||
 | 
						runtime.GOMAXPROCS(runtime.NumCPU())
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user