Skip to content

Commit

Permalink
Merge pull request #3 from Tomohiro/use-dep
Browse files Browse the repository at this point in the history
Use dep instead of glide to dependency management
  • Loading branch information
tomohiro committed Jun 30, 2017
2 parents 94f76aa + 068beaa commit d7cadd1
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ _testmain.go

# Vendoring
vendor
glide.lock
Gopkg.lock
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
language: go

before_install:
- sudo add-apt-repository ppa:masterminds/glide -y
- sudo apt-get update -q
- sudo apt-get install glide -y
- go get github.com/golang/dep/cmd/dep
- go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover

matrix:
fast_finish: true
include:
- go: 1.6
- go: 1.8
script: make test

after_success:
Expand Down
7 changes: 7 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[[constraint]]
name = "github.com/pkg/errors"
version = "0.7.1"

[[constraint]]
branch = "master"
name = "golang.org/x/oauth2"
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 - 2016 Tomohiro TAIRA
Copyright (c) 2015 - 2017 Tomohiro TAIRA

MIT License

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ test: deps

deps:
@echo "===> Installing runtime dependencies..."
glide install
dep ensure

updatedeps:
@echo "===> Updating runtime dependencies..."
glide update
dep ensure -update

.PHONY: help test deps updatedeps
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ Please check out the [CONTIRBUTING](CONTRIBUTING.md) guideline.
LICENSE
--------------------------------------------------------------------------------

© 2015 - 2016 Tomohiro TAIRA.
© 2015 - 2017 Tomohiro TAIRA.

This project is licensed under the MIT license. See [LICENSE](LICENSE) for details.
8 changes: 0 additions & 8 deletions glide.yaml

This file was deleted.

0 comments on commit d7cadd1

Please sign in to comment.