From 89ab4080b69bbf006f3dc4aeb5bbb451926884b4 Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 15:57:28 -0400 Subject: [PATCH 1/6] travis config mod --- .travis.yml | 12 ++++++------ README.md | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3757ff7d9..d17d1116a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -201,9 +201,9 @@ matrix: script: - go run build/ci.go purge -store gethstore/builds -days 14 -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/e09ccdce1048c5e03445 - on_success: change - on_failure: always +# notifications: +# webhooks: +# urls: +# - https://webhooks.gitter.im/e/e09ccdce1048c5e03445 +# on_success: change +# on_failure: always diff --git a/README.md b/README.md index 3d0d4d35d4..87f379cc12 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Official golang implementation of the Ethereum protocol. https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 )](https://godoc.org/github.com/ethereum/go-ethereum) [![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) -[![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) +[![Build Status](https://travis-ci.org/ShyftNetwork/shyft_go-ethereum.svg?branch=master)](https://travis-ci.org/ShyftNetwork/shyft_go-ethereum) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) Automated builds are available for stable releases and the unstable master branch. @@ -95,7 +95,7 @@ Specifying the `--testnet` flag however will reconfigure your Geth instance a bi `geth attach /testnet/geth.ipc`. Windows users are not affected by this. * Instead of connecting the main Ethereum network, the client will connect to the test network, which uses different P2P bootnodes, different network IDs and genesis states. - + *Note: Although there are some internal protective measures to prevent transactions from crossing over between the main network and test network, you should make sure to always use separate accounts for play-money and real-money. Unless you manually move accounts, Geth will by default correctly From 2236c17d0120ad8520883cb3901f473494d61739 Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 17:05:51 -0400 Subject: [PATCH 2/6] shyft geth github url linked --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d17d1116a4..c4753fa9d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/ShyftNetwork/shyft_go-ethereum sudo: false matrix: include: @@ -151,7 +151,7 @@ matrix: - export GOROOT=`pwd`/go - export GOPATH=$HOME/go script: - # Build the Android archive and upload it to Maven Central and Azure + # Build the Android archive and upload it gto Maven Central and Azure - curl https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip -o android-ndk-r15c.zip - unzip -q android-ndk-r15c.zip && rm android-ndk-r15c.zip - mv android-ndk-r15c $HOME @@ -178,6 +178,7 @@ matrix: - gem uninstall cocoapods -a -x - gem install cocoapods + - 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 From b591392b17d98fdc57a8f57048961a8519dab782 Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 17:13:40 -0400 Subject: [PATCH 3/6] added shyft repo url to ci build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4753fa9d0..edaee24560 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ShyftNetwork/shyft_go-ethereum +go_import_path: github.com/shyftnetwork/shyft_go-ethereum sudo: false matrix: include: From f6d6f18b2e53224860ae7d71dbd47426b0abf8eb Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 17:21:27 -0400 Subject: [PATCH 4/6] added shyft repo url to ci build --- build/ci.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ci.go b/build/ci.go index 24b58c1ae4..159cd9cb95 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/shyftnetwork/shyft_go-ethereum/internal/build" ) var ( @@ -738,7 +738,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/shyftnetwork/shyft_go-ethereum/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -858,7 +858,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/shyftnetwork/shyft_go-ethereum/mobile") if *local { // If we're building locally, use the build folder and stop afterwards From 4b756b4a1d5ff3712f004cb57538bade6023143e Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 17:24:06 -0400 Subject: [PATCH 5/6] travis config testing --- build/ci.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ci.go b/build/ci.go index 159cd9cb95..24b58c1ae4 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/shyftnetwork/shyft_go-ethereum/internal/build" + "github.com/ethereum/go-ethereum/internal/build" ) var ( @@ -738,7 +738,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/shyftnetwork/shyft_go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -858,7 +858,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/shyftnetwork/shyft_go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") if *local { // If we're building locally, use the build folder and stop afterwards From c95c755e9799c1fe4b77b4e197848a8f7c8dd16f Mon Sep 17 00:00:00 2001 From: priom Date: Mon, 4 Jun 2018 17:43:16 -0400 Subject: [PATCH 6/6] rollback go_import_path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edaee24560..c4753fa9d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/shyftnetwork/shyft_go-ethereum +go_import_path: github.com/ShyftNetwork/shyft_go-ethereum sudo: false matrix: include: