Merge pull request #11 from ripienaar/10

10
choria-legacy · May 9, 2018 · 0451bb5 · 0451bb5
2 parents 0afaad0 + d1b155a
commit 0451bb5
Show file tree

Hide file tree

Showing 15 changed files with 370 additions and 741 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - checkout
 
-      - run: go get github.com/golang/dep/cmd/dep
+      - run: go get github.com/Masterminds/glide
       - run: go get github.com/onsi/ginkgo/ginkgo
-      - run: dep ensure -v
+      - run: glide install
       - run: ginkgo -r -skipMeasurements .
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -0,0 +1,19 @@
+package: github.com/choria-io/go-protocol
+import:
+- package: github.com/prometheus/client_golang
+  subpackages:
+  - prometheus
+- package: github.com/sirupsen/logrus
+  version: ^1
+- package: github.com/xeipuuv/gojsonschema
+- package: github.com/golang/mock
+  version: ^1.1.1
+  subpackages:
+  - gomock
+testImport:
+- package: github.com/onsi/ginkgo
+  version: ^1
+- package: github.com/onsi/gomega
+  version: ^1
+- package: github.com/tidwall/gjson
+  version: ^1