diff options
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | build/ci-notes.md | 2 | ||||
| -rw-r--r-- | build/ci.go | 20 | ||||
| -rw-r--r-- | params/util.go | 4 |
4 files changed, 23 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 44f3d5507..4eda6d49b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: - gcc-multilib script: # Build for the primary platforms that Trusty can manage - - go run build/ci.go debsrc -signer "Felix Lange (Geth CI Testing Key) <fjl@twurst.com>" -upload ppa:lp-fjl/geth-ci-testing + - go run build/ci.go debsrc -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>" -upload ppa:ethereum/ethereum - go run build/ci.go install - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - go run build/ci.go install -arch 386 @@ -67,13 +67,10 @@ matrix: - go run build/ci.go install - 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 install cocoapods --pre - - travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds - # Build the Android archive and upload it to Maven Central and Azure - brew update - - brew install android-sdk maven + - brew install android-sdk maven gpg + - alias gpg="gpg2" - export ANDROID_HOME=/usr/local/opt/android-sdk - mkdir -p $ANDROID_HOME/platforms @@ -83,6 +80,13 @@ matrix: - 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 + - gem uninstall cocoapods -a + - gem install cocoapods --pre + - xctool -version + - xcrun simctl list + - travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds + install: - go get golang.org/x/tools/cmd/cover script: diff --git a/build/ci-notes.md b/build/ci-notes.md index 3fc2690b2..92e7c54d0 100644 --- a/build/ci-notes.md +++ b/build/ci-notes.md @@ -37,7 +37,7 @@ We want to build go-ethereum with the most recent version of Go, irrespective of version that is available in the main Ubuntu repository. In order to make this possible, our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on golang-1.7, which is co-installable alongside the regular golang package. PPA dependencies -can be edited at https://launchpad.net/%7Elp-fjl/+archive/ubuntu/geth-ci-testing/+edit-dependencies +can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies ## Building Packages Locally (for testing) diff --git a/build/ci.go b/build/ci.go index e8e08268b..8ddc50a0c 100644 --- a/build/ci.go +++ b/build/ci.go @@ -395,7 +395,7 @@ func maybeSkipArchive(env build.Environment) { log.Printf("skipping because this is a PR build") os.Exit(0) } - if env.Branch != "develop" && !strings.HasPrefix(env.Tag, "v1.") { + if env.Branch != "master" && !strings.HasPrefix(env.Tag, "v1.") { log.Printf("skipping because branch %q, tag %q is not on the whitelist", env.Branch, env.Tag) os.Exit(0) } @@ -459,7 +459,7 @@ func makeWorkdir(wdflag string) string { } func isUnstableBuild(env build.Environment) bool { - if env.Branch != "develop" && env.Tag != "" { + if env.Branch != "master" && env.Tag != "" { return false } return true @@ -672,8 +672,15 @@ func doAndroidArchive(cmdline []string) { // Skip Maven deploy and Azure upload for PR builds maybeSkipArchive(env) + // Sign and upload the archive to Azure + archive := "geth-" + archiveBasename("android", env) + ".aar" + os.Rename("geth.aar", archive) + + if err := archiveUpload(archive, *upload, *signer); err != nil { + log.Fatal(err) + } // Sign and upload all the artifacts to Maven Central - os.Rename("geth.aar", meta.Package+".aar") + os.Rename(archive, meta.Package+".aar") if *signer != "" && *deploy != "" { // Import the signing key into the local GPG instance if b64key := os.Getenv(*signer); b64key != "" { @@ -694,13 +701,6 @@ func doAndroidArchive(cmdline []string) { "-settings=build/mvn.settings", "-Durl="+repo, "-DrepositoryId=ossrh", "-DpomFile="+meta.Package+".pom", "-Dfile="+meta.Package+".aar") } - // Sign and upload the archive to Azure - archive := "geth-" + archiveBasename("android", env) + ".aar" - os.Rename(meta.Package+".aar", archive) - - if err := archiveUpload(archive, *upload, *signer); err != nil { - log.Fatal(err) - } } func gomobileTool(subcmd string, args ...string) *exec.Cmd { diff --git a/params/util.go b/params/util.go index b96f33da2..d3c805455 100644 --- a/params/util.go +++ b/params/util.go @@ -35,8 +35,8 @@ var ( TestNetHomesteadGasRepriceHash = common.HexToHash("0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145") // Testnet gas reprice block hash (used by fast sync) MainNetHomesteadGasRepriceHash = common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0") // Mainnet gas reprice block hash (used by fast sync) - TestNetSpuriousDragon = big.NewInt(3000000) - MainNetSpuriousDragon = big.NewInt(3000000) + TestNetSpuriousDragon = big.NewInt(1885000) + MainNetSpuriousDragon = big.NewInt(2675000) TestNetChainID = big.NewInt(2) // Test net default chain ID MainNetChainID = big.NewInt(1) // main net default chain ID |