vendor: resolve issues with semver dependencies #60

ory · Aug 8, 2016 · 1b35e25 · 1b35e25
1 parent 983ecd9
commit 1b35e25
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 node_modules/
 *.iml
 *.exe
-.cover/
+.cover/
+vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
   - docker
 
 env:
-  - DOCKER_BIND_LOCALHOST=true
+  - DOCKER_BIND_LOCALHOST=true GO15VENDOREXPERIMENT=1
 
 go:
   - 1.4
@@ -20,8 +20,8 @@ matrix:
     - go: 1.4
 
 install:
-  - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover
-  - go get -t ./...
+  - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
+  - glide install
 
 script:
   - go vet -x .

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,7 +2,7 @@ package: github.com/ory-am/dockertest
 import:
 - package: github.com/go-errors/errors
 - package: github.com/go-sql-driver/mysql
-  version: ~1.2.0
+  version: 0b58b37b664c21f3010e836f1b931e1d0b0b0685
 - package: github.com/lib/pq
 - package: github.com/ory-am/common
   subpackages:
@@ -17,14 +17,14 @@ testImport:
   subpackages:
   - redis
 - package: github.com/go-stomp/stomp
-  version: ~1.0.1
+  version: 364e36fe21291dd5aec3cba10ea15b0e654d9b40
 - package: github.com/gocql/gocql
 - package: github.com/hashicorp/consul
   version: ~0.7.0-test2
   subpackages:
   - api
 - package: github.com/mattbaird/elastigo
-  version: ~1.0.0
+  version: 34c4c4d8425cbdcbc8e257943a2044d5e9f7dab5
   subpackages:
   - lib
 - package: github.com/samuel/go-zookeeper
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
     node_modules/
     *.iml
     *.exe
-    .cover/
+    .cover/
+    vendor/