diff --git a/Makefile b/Makefile index d4a442545..26ffa0846 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,23 @@ +BRANCH = "master" +VERSION = $(shell cat ./VERSION) + build: @go build -o ./bin/neo-go ./cli/main.go +check-version: + git fetch && (! git rev-list ${VERSION}) + deps: @glide install +push-tag: + git checkout ${BRANCH} + git pull origin ${BRANCH} + git tag ${VERSION} + git push origin ${BRANCH} --tags + test: - @go test $(glide nv) -cover \ No newline at end of file + @go test $(shell glide nv) -cover + +vet: + @go vet $(shell glide nv) \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..6c6aa7cb0 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.0 \ No newline at end of file diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..86ce09569 --- /dev/null +++ b/circle.yml @@ -0,0 +1,86 @@ +version: 2 +jobs: + install_deps: + working_directory: /go/src/github.com/CityOfZion/neo-go + docker: + - image: vidsyhq/go-builder:latest + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - run: BUILD=false /scripts/build.sh + - save_cache: + key: dependency-cache-{{ .Revision }} + paths: + - vendor + test: + working_directory: /go/src/github.com/CityOfZion/neo-go + docker: + - image: vidsyhq/go-builder:latest + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - run: make test + vet: + working_directory: /go/src/github.com/CityOfZion/neo-go + docker: + - image: vidsyhq/go-builder:latest + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - run: make vet + check_version: + working_directory: /go/src/github.com/CityOfZion/neo-go + docker: + - image: vidsyhq/go-builder:latest + steps: + - checkout + - run: make check-version + build_cli: + working_directory: /go/src/github.com/CityOfZion/neo-go + docker: + - image: vidsyhq/go-builder:latest + steps: + - checkout + - run: make build + +workflows: + version: 2 + workflow: + jobs: + - install_deps: + filters: + tags: + only: /[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: master + - test: + requires: + - install_deps + filters: + tags: + only: /[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: master + - vet: + requires: + - install_deps + filters: + tags: + only: /[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: master + - check_version: + filters: + branches: + ignore: master + - build_cli: + requires: + - install_deps + filters: + tags: + only: /[0-9]+\.[0-9]+\.[0-9]+/ + branches: + ignore: master \ No newline at end of file diff --git a/cli/main.go b/cli/main.go index fff926922..c8b13fd1a 100644 --- a/cli/main.go +++ b/cli/main.go @@ -4,7 +4,7 @@ import ( "flag" "strings" - "github.com/anthdm/neo-go/pkg/network" + "github.com/CityOfZion/neo-go/pkg/network" ) var ( diff --git a/glide.lock b/glide.lock index a3815ad55..59f70a101 100644 --- a/glide.lock +++ b/glide.lock @@ -1,11 +1,4 @@ -hash: 054e4119c1d6deac9c76a3f6ecc319c80d2099d6dd4fd804b03ce47a9b1ccc86 -updated: 2018-02-01T17:18:00.958758Z -imports: -- name: github.com/anthdm/neo-go - version: 3b91a4808e67c54687a4ba90ac4caf584398cea4 - subpackages: - - pkg/core - - pkg/network - - pkg/network/payload - - pkg/util +hash: b1152abdd9a1fa1e70773cddcf54247d3fe3332602604f9f2233165ced02eeaf +updated: 2018-02-01T18:34:22.684905Z +imports: [] testImports: [] diff --git a/glide.yaml b/glide.yaml index dc88f8824..3b61baf8d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,8 +1,2 @@ package: github.com/CityOfZion/neo-go -import: -- package: github.com/anthdm/neo-go - subpackages: - - pkg/core - - pkg/network - - pkg/network/payload - - pkg/util +import: [] diff --git a/pkg/core/block.go b/pkg/core/block.go index 5e8eece3c..9b82c6960 100644 --- a/pkg/core/block.go +++ b/pkg/core/block.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - . "github.com/anthdm/neo-go/pkg/util" + . "github.com/CityOfZion/neo-go/pkg/util" ) // Block represents one block in the chain. diff --git a/pkg/network/message.go b/pkg/network/message.go index 070cec320..3d9dc96a1 100644 --- a/pkg/network/message.go +++ b/pkg/network/message.go @@ -8,8 +8,8 @@ import ( "fmt" "io" - "github.com/anthdm/neo-go/pkg/core" - "github.com/anthdm/neo-go/pkg/network/payload" + "github.com/CityOfZion/neo-go/pkg/core" + "github.com/CityOfZion/neo-go/pkg/network/payload" ) const ( diff --git a/pkg/network/message_test.go b/pkg/network/message_test.go index 4b4e5608f..6b1c5b596 100644 --- a/pkg/network/message_test.go +++ b/pkg/network/message_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/anthdm/neo-go/pkg/network/payload" + "github.com/CityOfZion/neo-go/pkg/network/payload" ) func TestMessageEncodeDecode(t *testing.T) { diff --git a/pkg/network/payload/addr.go b/pkg/network/payload/addr.go index b5376524a..26f2de4af 100644 --- a/pkg/network/payload/addr.go +++ b/pkg/network/payload/addr.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/util" ) // AddrWithTime payload diff --git a/pkg/network/payload/addr_test.go b/pkg/network/payload/addr_test.go index c021b72df..8f2da310d 100644 --- a/pkg/network/payload/addr_test.go +++ b/pkg/network/payload/addr_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/util" ) func TestEncodeDecodeAddr(t *testing.T) { diff --git a/pkg/network/payload/getblocks.go b/pkg/network/payload/getblocks.go index 81371cb25..f7a84a1c2 100644 --- a/pkg/network/payload/getblocks.go +++ b/pkg/network/payload/getblocks.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - . "github.com/anthdm/neo-go/pkg/util" + . "github.com/CityOfZion/neo-go/pkg/util" ) // HashStartStop contains fields and methods to be shared with the diff --git a/pkg/network/payload/getblocks_test.go b/pkg/network/payload/getblocks_test.go index c73772386..5c62edd96 100644 --- a/pkg/network/payload/getblocks_test.go +++ b/pkg/network/payload/getblocks_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - . "github.com/anthdm/neo-go/pkg/util" + . "github.com/CityOfZion/neo-go/pkg/util" ) func TestGetBlocksEncodeDecode(t *testing.T) { diff --git a/pkg/network/payload/getheaders.go b/pkg/network/payload/getheaders.go index 9ade274f7..ce71a626c 100644 --- a/pkg/network/payload/getheaders.go +++ b/pkg/network/payload/getheaders.go @@ -1,6 +1,6 @@ package payload -import "github.com/anthdm/neo-go/pkg/util" +import "github.com/CityOfZion/neo-go/pkg/util" // GetHeaders payload is the same as the "GetBlocks" payload. type GetHeaders struct { diff --git a/pkg/network/payload/getheaders_test.go b/pkg/network/payload/getheaders_test.go index 32cbb1b86..87a3e6672 100644 --- a/pkg/network/payload/getheaders_test.go +++ b/pkg/network/payload/getheaders_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/util" ) func TestGetHeadersEncodeDecode(t *testing.T) { diff --git a/pkg/network/payload/inventory.go b/pkg/network/payload/inventory.go index 306995016..46310bfe5 100644 --- a/pkg/network/payload/inventory.go +++ b/pkg/network/payload/inventory.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - . "github.com/anthdm/neo-go/pkg/util" + . "github.com/CityOfZion/neo-go/pkg/util" ) // The node can broadcast the object information it owns by this message. diff --git a/pkg/network/payload/inventory_test.go b/pkg/network/payload/inventory_test.go index 774e33017..4cfba1ef5 100644 --- a/pkg/network/payload/inventory_test.go +++ b/pkg/network/payload/inventory_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - . "github.com/anthdm/neo-go/pkg/util" + . "github.com/CityOfZion/neo-go/pkg/util" ) func TestInventoryEncodeDecode(t *testing.T) { diff --git a/pkg/network/peer.go b/pkg/network/peer.go index 36a4f87f2..c83b7b24c 100644 --- a/pkg/network/peer.go +++ b/pkg/network/peer.go @@ -1,7 +1,7 @@ package network import ( - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/util" ) // Peer is the local representation of a remote node. It's an interface that may diff --git a/pkg/network/server.go b/pkg/network/server.go index c18c11695..0d568482c 100644 --- a/pkg/network/server.go +++ b/pkg/network/server.go @@ -7,8 +7,8 @@ import ( "os" "time" - "github.com/anthdm/neo-go/pkg/network/payload" - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/CityOfZion/neo-go/pkg/util" ) const ( diff --git a/pkg/network/server_test.go b/pkg/network/server_test.go index f0ba721f7..115c2b74c 100644 --- a/pkg/network/server_test.go +++ b/pkg/network/server_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - "github.com/anthdm/neo-go/pkg/network/payload" + "github.com/CityOfZion/neo-go/pkg/network/payload" ) func TestHandleVersion(t *testing.T) { diff --git a/pkg/network/tcp.go b/pkg/network/tcp.go index 648fe6274..4c9b13b4d 100644 --- a/pkg/network/tcp.go +++ b/pkg/network/tcp.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/anthdm/neo-go/pkg/network/payload" - "github.com/anthdm/neo-go/pkg/util" + "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/CityOfZion/neo-go/pkg/util" ) func listenTCP(s *Server, port int) error {