Skip to content

Commit

Permalink
all: resolve race condition and package fosite with glide
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas authored Aug 9, 2016
1 parent c947f0b commit 66b53a9
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 28 deletions.
13 changes: 4 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
language: go

go:
- 1.4
- 1.5
- 1.6
- 1.7
- tip

matrix:
allow_failures:
- go: tip
- go: 1.4
env:
- GO15VENDOREXPERIMENT=1

install:
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
- glide up
- glide install

script:
- gotestcover -coverprofile="cover.out" -race -covermode="count" ./...
- gotestcover -coverprofile="cover.out" -race -covermode="count" $(glide novendor)
- goveralls -coverprofile="cover.out"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ OAuth2 stack, that's no problem. Or custom assertions, what ever you like and as

## Installation

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

```
Expand Down
149 changes: 135 additions & 14 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 21 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
package: github.com/ory-am/fosite
import:
- package: github.com/Sirupsen/logrus
version: ~0.10.0
- package: github.com/asaskevich/govalidator
version: ~4.0.0
- package: github.com/dgrijalva/jwt-go
version: ~2.7.0
- package: github.com/go-errors/errors
- package: github.com/golang/mock
subpackages:
- gomock
- package: github.com/ory-am/common
subpackages:
- pkg
- package: github.com/parnurzeal/gorequest
version: ~0.2.13
- package: github.com/pborman/uuid
version: ~1.0.0
- package: github.com/pkg/errors
version: ~0.7.0
- package: golang.org/x/crypto
subpackages:
- bcrypt
Expand All @@ -21,3 +24,17 @@ import:
- package: golang.org/x/oauth2
subpackages:
- clientcredentials
- package: github.com/gorilla/mux
version: ~1.1.0
- package: github.com/gorilla/context
version: ~1.1.0
- package: github.com/go-errors/errors
- package: github.com/oleiade/reflections
version: ~0.1.2
- package: github.com/ory-am/common
testImport:
- package: github.com/stretchr/testify
version: ~1.1.3
subpackages:
- assert
- require

0 comments on commit 66b53a9

Please sign in to comment.