diff --git a/.travis.yml b/.travis.yml index c29344f0ce..4eda6d49b8 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) " -upload ppa:lp-fjl/geth-ci-testing + - go run build/ci.go debsrc -signer "Go Ethereum Linux Builder " -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 @@ -83,6 +83,8 @@ matrix: # 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: diff --git a/build/ci-notes.md b/build/ci-notes.md index 3fc2690b2c..92e7c54d0a 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 9d1543ea44..8ddc50a0ca 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 diff --git a/cmd/utils/version.go b/cmd/utils/version.go index b057f4293b..801017e802 100644 --- a/cmd/utils/version.go +++ b/cmd/utils/version.go @@ -30,7 +30,7 @@ import ( const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release + VersionPatch = 1 // Patch version component of the current release VersionMeta = "unstable" // Version metadata to append to the version string ) diff --git a/params/util.go b/params/util.go index b96f33da27..d3c805455b 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