Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
Glide with semver dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
nanliu committed Jul 25, 2016
1 parent 5137f6c commit f6d4ee9
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 227 deletions.
209 changes: 0 additions & 209 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

13 changes: 4 additions & 9 deletions docs/BUILD_AND_TEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,9 @@ $ go get -d github.com/intelsdi-x/snap
$ cd $GOPATH/src/github.com/intelsdi-x/snap
```

[godeps](https://github.com/tools/godep) is a dependency for running the `make` task(s) required for the build process. If it is not already installed, install `godeps` now:
For Go 1.5.x, enable GOVENDOREXPERIMENT. This is not required in GO 1.6+:
```
$ # first check to see if it is installed
$ which godep
$ # if not installed, do so
$ # then download and set your path
$ go get github.com/tools/godep
$ export PATH=$GOPATH/bin/
$ export GOVENDOREXPERIMENT=1
```

In the `snap/` directory there's a `Makefile` that builds all dependencies and then the Snap Framework binaries. To get dependencies and build Snap run:
Expand All @@ -54,9 +49,9 @@ $ cd $GOPATH/src/github.com/intelsdi-x/snap
$ make
```

It runs `make deps` and `make all` commands for you. Alternatively, you can run `make` with any of these other targets:
By default `make` runs `make deps` and `make all` commands for you. Alternatively, you can run `make` with any of these other targets:

* `deps`: fetches all dependencies using godeps
* `deps`: fetches all dependencies using glide
* `check`: runs test suite
* `all`: builds snapd, snapctl, and the test plugins
* `snap` builds snapd and snapctl
Expand Down
53 changes: 53 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package: github.com/intelsdi-x/snap
import:
- package: github.com/Sirupsen/logrus
version: be52937128b38f1d99787bb476c789e2af1147f1
- package: github.com/appc/spec
version: db96f94ae6b227fe4d8288527ead8927181620f6
subpackages:
- aci
- schema
- package: github.com/asaskevich/govalidator
version: 9699ab6b38bee2e02cd3fe8b99ecf67665395c96
- package: github.com/codegangsta/cli
version: 01857ac33766ce0c93856370626f9799281c14f4
- package: github.com/codegangsta/negroni
version: c7477ad8e330bef55bf1ebe300cf8aa67c492d1b
- package: github.com/ghodss/yaml
version: c3eb24aeea63668ebdac08d2e252f20df8b6b1ae
- package: github.com/golang/protobuf
version: 8616e8ee5e20a1704615e6c8d7afcdac06087a67
subpackages:
- proto
- package: github.com/hashicorp/go-msgpack
version: fa3f63826f7c23912c15263591e65d54d080b458
subpackages:
- codec
- package: github.com/hashicorp/memberlist
version: a93fbd426dd831f5a66db3adc6a5ffa6f44cc60a
- package: github.com/intelsdi-x/gomit
- package: github.com/julienschmidt/httprouter
version: 8c199fb6259ffc1af525cc3ad52ee60ba8359669
- package: github.com/pborman/uuid
version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
- package: github.com/robfig/cron
version: 32d9c273155a0506d27cf73dd1246e86a470997e
- package: github.com/vrischmann/jsonutil
version: 694784f9315ee9fc763c1d30f28753cba21307aa
- package: github.com/xeipuuv/gojsonschema
version: d3178baac32433047aa76f07317f84fbe2be6cda
- package: golang.org/x/crypto
version: aedad9a179ec1ea11b7064c57cbc6dc30d7724ec
subpackages:
- openpgp
- ssh/terminal
- package: golang.org/x/net
version: 04557861f124410b768b1ba5bb3a91b705afbfc6
subpackages:
- context
- trace
- http2
- package: google.golang.org/grpc
version: 88aeffff979aa77aa502cb011423d0a08fa12c5a
- package: gopkg.in/yaml.v2
version: c1cd2254a6dd314c9d73c338c12688c9325d85c6
3 changes: 2 additions & 1 deletion scheduler/wmap/wmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ import (
"regexp"
"strings"

yaml "gopkg.in/yaml.v2"

"github.com/intelsdi-x/snap/core/cdata"
"github.com/intelsdi-x/snap/core/ctypes"
"gopkg.in/yaml.v2"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions scripts/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ __proj_dir="$(dirname "$__dir")"

_go_path

_go_get github.com/tools/godep
_go_get github.com/Masterminds/glide

_info "restoring dependency with godep"
(cd "${__proj_dir}" && godep restore)
_info "restoring dependency with glide"
(cd "${__proj_dir}" && glide install)

0 comments on commit f6d4ee9

Please sign in to comment.