Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
refactor: replace glide with govendor (#48)
  • Loading branch information
appleboy committed Mar 12, 2017
1 parent 38303e1 commit 1dae5b8
Show file tree
Hide file tree
Showing 400 changed files with 170,067 additions and 99 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -23,5 +23,4 @@ _testmain.go
*.test
*.prof

vendor
.cover
5 changes: 0 additions & 5 deletions .travis.yml
Expand Up @@ -15,13 +15,8 @@ env:
global:
- secure: fB4N5c2BfEoaNkpGDM1wPbB9zV4ZhQqsnWZ+wyj8iDWyHlOw3Ungqb3nMEuVQMn3Yeu/PMLeDxd2h2at3+k+8g3IlEdKHS+uMzATVtOwBxwXPjBAB/oROCZPj3QlEFP32Z5AgGK9+tgl/dGjlaRvJ+BTv3YL3UMxPoaxXmi8IN0F2Z48rNgnsdyvq/u3htUGl03YkFZgucVuZ8GGD3TDOoMylcyZ8jYDooQOfoOSh+c1hFj4+mFls4t5Nc9tfgtbhrtzU7SFUKvYe14ryCxVNC7WeyUvS32nrWIS52yhxiyYU0o1umzdVqK/CwKoGh4LetiwmzDMyqZDyzVvcuvAaJ7D2FTU/yJ8t5wb0uWtmCbb6i258voS79LbnCeTxMTBn+h3CFsPKwR+xoiue+2jXIUP4K1+bk8Bj0cSfAwSlY2xkVzB/EpEXhPKlY/cGDMXF5WPpzUyeNdOUMlOiiVJ68V/H7ZwxfWMrgFxmeLHRnrrJtIVPTLdbtigf0WFew48+WELo9lv6SVYy7Q+Y46A46nNBDKqbJtHT/AhHPgqmi0Bt+5NZ/q0DgQd7og/ISGy0tbFRUUcKNFEumGjndtv7eY6GCvMIyEPZXclzPdNrPqAdWDqNeP6cwBCljx7Fve50QDe/3KAwMLEMvux9Qn0KcgIMNCrhfnAGJqEKx8BZvc=

before_install:
- mkdir -p $GOPATH/bin
- curl https://glide.sh/get | sh

install:
- go get github.com/mattn/goveralls
- make install

script:
- make test
Expand Down
10 changes: 3 additions & 7 deletions Makefile
@@ -1,12 +1,8 @@
.PHONY: all example test

TARGETS_NOVENDOR := $(shell glide novendor)
export PROJECT_PATH = /go/src/github.com/appleboy/gofight

all: install test

install:
glide install
all: test

example:
cd example && go test -v -cover .
Expand All @@ -19,7 +15,7 @@ docker_test: clean
-v $(PWD):$(PROJECT_PATH) \
-w=$(PROJECT_PATH) \
appleboy/golang-testing \
sh -c "make install && coverage all"
sh -c "coverage all"

clean:
rm -rf .cover vendor
rm -rf .cover
2 changes: 1 addition & 1 deletion example/gin.go
Expand Up @@ -3,7 +3,7 @@ package example
import (
"net/http"

"gopkg.in/gin-gonic/gin.v1"
"github.com/gin-gonic/gin"
)

func ginHelloHandler(c *gin.Context) {
Expand Down
2 changes: 1 addition & 1 deletion framework/gin.go
Expand Up @@ -3,7 +3,7 @@ package framework
import (
"net/http"

"gopkg.in/gin-gonic/gin.v1"
"github.com/gin-gonic/gin"
)

// Binding from JSON
Expand Down
70 changes: 0 additions & 70 deletions glide.lock

This file was deleted.

12 changes: 0 additions & 12 deletions glide.yaml

This file was deleted.

1 change: 0 additions & 1 deletion gofight.go
Expand Up @@ -61,7 +61,6 @@ import (
"strings"
"testing"

// "github.com/labstack/echo"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion gofight_test.go
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/appleboy/gofight/framework"
"github.com/buger/jsonparser"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
"gopkg.in/gin-gonic/gin.v1"
)

var goVersion = runtime.Version()
Expand Down
12 changes: 12 additions & 0 deletions vendor/github.com/buger/jsonparser/Dockerfile

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

21 changes: 21 additions & 0 deletions vendor/github.com/buger/jsonparser/LICENSE

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

36 changes: 36 additions & 0 deletions vendor/github.com/buger/jsonparser/Makefile

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

0 comments on commit 1dae5b8

Please sign in to comment.