Skip to content

Commit 66b53a9

Browse files
authored
all: resolve race condition and package fosite with glide
1 parent c947f0b commit 66b53a9

File tree

4 files changed

+161
-28
lines changed

4 files changed

+161
-28
lines changed

.travis.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
language: go
22

33
go:
4-
- 1.4
54
- 1.5
65
- 1.6
7-
- 1.7
8-
- tip
96

10-
matrix:
11-
allow_failures:
12-
- go: tip
13-
- go: 1.4
7+
env:
8+
- GO15VENDOREXPERIMENT=1
149

1510
install:
1611
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
17-
- glide up
12+
- glide install
1813

1914
script:
20-
- gotestcover -coverprofile="cover.out" -race -covermode="count" ./...
15+
- gotestcover -coverprofile="cover.out" -race -covermode="count" $(glide novendor)
2116
- goveralls -coverprofile="cover.out"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ OAuth2 stack, that's no problem. Or custom assertions, what ever you like and as
140140

141141
## Installation
142142

143-
You will need [Go](https://golang.org) installed on your machine and it is required that you have set up your
143+
[Go 1.5+](https://golang.org) must be installed on your system and it is required that you have set up your
144144
GOPATH environment variable.
145145

146146
```

glide.lock

Lines changed: 135 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
package: github.com/ory-am/fosite
22
import:
3+
- package: github.com/Sirupsen/logrus
4+
version: ~0.10.0
35
- package: github.com/asaskevich/govalidator
6+
version: ~4.0.0
47
- package: github.com/dgrijalva/jwt-go
58
version: ~2.7.0
6-
- package: github.com/go-errors/errors
79
- package: github.com/golang/mock
810
subpackages:
911
- gomock
10-
- package: github.com/ory-am/common
11-
subpackages:
12-
- pkg
1312
- package: github.com/parnurzeal/gorequest
13+
version: ~0.2.13
1414
- package: github.com/pborman/uuid
15+
version: ~1.0.0
16+
- package: github.com/pkg/errors
17+
version: ~0.7.0
1518
- package: golang.org/x/crypto
1619
subpackages:
1720
- bcrypt
@@ -21,3 +24,17 @@ import:
2124
- package: golang.org/x/oauth2
2225
subpackages:
2326
- clientcredentials
27+
- package: github.com/gorilla/mux
28+
version: ~1.1.0
29+
- package: github.com/gorilla/context
30+
version: ~1.1.0
31+
- package: github.com/go-errors/errors
32+
- package: github.com/oleiade/reflections
33+
version: ~0.1.2
34+
- package: github.com/ory-am/common
35+
testImport:
36+
- package: github.com/stretchr/testify
37+
version: ~1.1.3
38+
subpackages:
39+
- assert
40+
- require

0 commit comments

Comments
 (0)