Replace glide with godep (#27)

This commit is contained in:
Pawan Rawal 2018-02-24 18:23:02 +11:00 committed by Anthony De Meulemeester
parent 8fe079ec8e
commit bebdabab9f
9 changed files with 116 additions and 57 deletions

3
.gitignore vendored
View file

@ -10,9 +10,6 @@
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/
# Added by CoZ developers
vendor/
bin/

55
Gopkg.lock generated Normal file
View file

@ -0,0 +1,55 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
name = "github.com/CityOfZion/neo-go"
packages = [
"cli/server",
"cli/smartcontract",
"pkg/core",
"pkg/network",
"pkg/network/payload",
"pkg/util",
"pkg/vm",
"pkg/vm/compiler"
]
revision = "8fe079ec8ebb83ce53d6f1535bfe513271231958"
version = "0.11.0"
[[projects]]
branch = "master"
name = "github.com/golang/snappy"
packages = ["."]
revision = "553a641470496b2327abcac10b36396bd98e45c9"
[[projects]]
branch = "master"
name = "github.com/syndtr/goleveldb"
packages = [
"leveldb",
"leveldb/cache",
"leveldb/comparer",
"leveldb/errors",
"leveldb/filter",
"leveldb/iterator",
"leveldb/journal",
"leveldb/memdb",
"leveldb/opt",
"leveldb/storage",
"leveldb/table",
"leveldb/util"
]
revision = "211f780988068502fe874c44dae530528ebd840f"
[[projects]]
name = "github.com/urfave/cli"
packages = ["."]
revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
version = "v1.20.0"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "ac1d2cc7e9e2cb3985a84af2b75ad9fd78a3b8278abb6d5f7b6dd2210df7c6a2"
solver-name = "gps-cdcl"
solver-version = 1

37
Gopkg.toml Normal file
View file

@ -0,0 +1,37 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true
[[constraint]]
branch = "master"
name = "github.com/syndtr/goleveldb"
[[constraint]]
name = "github.com/urfave/cli"
version = "1.20.0"
[prune]
go-tests = true
unused-packages = true

View file

@ -8,7 +8,7 @@ check-version:
git fetch && (! git rev-list ${VERSION})
deps:
@glide install
@dep ensure
push-tag:
git checkout ${BRANCH}
@ -17,7 +17,7 @@ push-tag:
git push origin ${BRANCH} --tags
test:
@go test $(shell glide nv) -cover
@go test ./... -cover
vet:
@go vet $(shell glide nv)
@go vet ./...

View file

@ -58,7 +58,7 @@ The project will exist out of the following packages:
## Server
Install dependencies, this requires [Glide](https://github.com/Masterminds/glide#install):
Install dependencies, this requires [dep](https://github.com/golang/dep):
```
make deps
@ -153,7 +153,7 @@ INDEX OPCODE DESC
# Contributing
Feel free to contribute to this project after reading the
[contributing guidelines](https://github.com/anthdm/neo-go/blob/master/CONTRIBUTING.md).
[contributing guidelines](https://github.com/CityOfZion/neo-go/blob/master/CONTRIBUTING.md).
Before starting to work on a certain topic, create an new issue first,
describing the feauture/topic you are going to implement.

View file

@ -1 +1 @@
0.11.0
0.12.0

View file

@ -6,8 +6,8 @@ jobs:
- image: vidsyhq/go-builder:latest
steps:
- checkout
- run: go get github.com/Masterminds/glide
- run: glide install
- run: go get -u github.com/golang/dep/cmd/dep
- run: dep ensure
- restore_cache:
key: dependency-cache-{{ .Revision }}
- run: BUILD=false /scripts/build.sh
@ -46,8 +46,8 @@ jobs:
- image: vidsyhq/go-builder:latest
steps:
- checkout
- run: go get github.com/Masterminds/glide
- run: glide install
- run: go get -u github.com/golang/dep/cmd/dep
- run: dep ensure
- run: make build
workflows:

23
glide.lock generated
View file

@ -1,23 +0,0 @@
hash: 5cb2fb077aa0e57c788a99f9ded4bf2d421a04f12f6b8436234d12e93f418f36
updated: 2018-02-09T16:49:32.538502496+01:00
imports:
- name: github.com/golang/snappy
version: 553a641470496b2327abcac10b36396bd98e45c9
- name: github.com/syndtr/goleveldb
version: 211f780988068502fe874c44dae530528ebd840f
subpackages:
- leveldb
- leveldb/cache
- leveldb/comparer
- leveldb/errors
- leveldb/filter
- leveldb/iterator
- leveldb/journal
- leveldb/memdb
- leveldb/opt
- leveldb/storage
- leveldb/table
- leveldb/util
- name: github.com/urfave/cli
version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1
testImports: []

View file

@ -1,7 +0,0 @@
package: github.com/CityOfZion/neo-go
import:
- package: github.com/syndtr/goleveldb
subpackages:
- leveldb
- package: github.com/urfave/cli
version: ^1.20.0