Skip to content
This repository has been archived by the owner on Dec 7, 2020. It is now read-only.

Commit

Permalink
Dep Dependency Tool
Browse files Browse the repository at this point in the history
- switched to using dep to dependencies
- updated the CHANGELOG to reflect changes
- updated the Makefile to use and install the dep tool
  • Loading branch information
gambol99 authored and Bruno Oliveira committed May 30, 2018
1 parent 7c4b286 commit 49343d4
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 202 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ language: go
go:
- "1.10.2"
install:
- go get github.com/Masterminds/glide
- go get -u github.com/golang/dep/cmd/dep
- go get github.com/mattn/goveralls
- go get -u github.com/client9/misspell/cmd/misspell
script:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ FEATURES:
* Adding the `--enable-session-cookies` to enable session only cookies [#PR357](https://github.com/gambol99/keycloak-proxy/pull/357)
* Adding a ability to match string arrays claims [#PR364](https://github.com/gambol99/keycloak-proxy/pull/364)
* Imported the fix to the cache headers from upstream go-oidc [#PR341](https://github.com/gambol99/keycloak-proxy/pull/341)
* Switching to using SHA256 from MD5 for the token hash [#PR350](https://github.com/gambol99/keycloak-proxy/pull/350)
* Switched from glide to dep lib tool [#PR373](https://github.com/gambol99/keycloak-proxy/pull/373)
* Switched to using SHA256 from MD5 for the token hash [#PR350](https://github.com/gambol99/keycloak-proxy/pull/350)
* Switched to using golang v1.10.2 [#PR374](https://github.com/gambol99/keycloak-proxy/pull/374)
* Added a warning messaage to indicate disabling the write-timeout when using pprof [#PR370](https://github.com/gambol99/keycloak-proxy/pull/370)

Expand Down
51 changes: 29 additions & 22 deletions Gopkg.lock

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

8 changes: 6 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
Expand Down Expand Up @@ -29,6 +29,10 @@
name = "github.com/PuerkitoBio/purell"
version = "1.1.0"

[[constraint]]
name = "github.com/fsnotify/fsnotify"
version = "1.4.7"

[[constraint]]
branch = "master"
name = "github.com/gambol99/go-oidc"
Expand All @@ -42,8 +46,8 @@
version = "1.1.0"

[[constraint]]
branch = "master"
name = "github.com/urfave/cli"
version = "1.19.1"

[prune]
go-tests = true
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ authors:
@echo "--> Updating the AUTHORS"
git log --format='%aN <%aE>' | sort -u > AUTHORS

glide-install:
dep-install:
@echo "--> Installing dependencies"
@glide install
@dep ensure

deps:
@echo "--> Installing build dependencies"
@go get github.com/Masterminds/glide
@$(MAKE) glide-install
@go get -u github.com/golang/dep/cmd/dep
@$(MAKE) dep-install

vet:
@echo "--> Running go vet $(VETARGS) ."
Expand Down Expand Up @@ -144,7 +144,7 @@ spelling:
test:
@echo "--> Running the tests"
@if [ ! -d "vendor" ]; then \
make glide-install; \
make dep-install; \
fi
@go test -v
@$(MAKE) golang
Expand Down
135 changes: 0 additions & 135 deletions glide.lock

This file was deleted.

Loading

0 comments on commit 49343d4

Please sign in to comment.