Skip to content

Commit

Permalink
Use vgo instead of glide
Browse files Browse the repository at this point in the history
  • Loading branch information
mizzy committed Apr 10, 2018
1 parent ad36176 commit 398077a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 34 deletions.
26 changes: 11 additions & 15 deletions Makefile
Expand Up @@ -3,29 +3,25 @@ NAME := nolmandy
all: build

setup:
go get github.com/Masterminds/glide
go get golang.org/x/vgo
go get github.com/golang/lint/golint
go get golang.org/x/tools/cmd/goimports

deps: setup
glide install

test: deps lint
go test $$(glide novendor | grep -v cmd)
go test -race $$(glide novendor | grep -v cmd)
test: lint
vgo test ./...
vgo test -race ./...

lint: setup
go vet $$(glide novendor | grep -v cmd)
for pkg in $$(glide novendor -x); do \
golint -set_exit_status $$pkg || exit $$?; \
done
vgo vet ./...
golint ./...

fmt: setup
goimports -w $$(glide nv -x)
goimports -w .

build: deps
go build -o bin/$(NAME) cmd/nolmandy/nolmandy.go
go build -o bin/$(NAME)-server cmd/nolmandy/nolmandy_server.go
build:
vgo build -o bin/$(NAME) cmd/nolmandy/nolmandy.go
vgo build -o bin/$(NAME)-server cmd/nolmandy/nolmandy_server.go

clean:
rm bin/$(NAME)

4 changes: 2 additions & 2 deletions appengine/app/Makefile
@@ -1,10 +1,10 @@
setup:
go get github.com/Masterminds/glide
go get golang.org/x/vgo
go get github.com/golang/lint/golint
go get golang.org/x/tools/cmd/goimports

deps: setup
cd ../.. && glide install
cd ../.. && vgo vendor

deploy: deps
GOPATH=../_gopath:../_gopath/vendor gcloud app deploy
10 changes: 0 additions & 10 deletions glide.lock

This file was deleted.

7 changes: 0 additions & 7 deletions glide.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions go.mod
@@ -0,0 +1,6 @@
module "github.com/aktsk/nolmandy"

require (
"github.com/fullsailor/pkcs7" v0.0.0-20180223002317-1d5002593acb
"github.com/rakyll/statik" v0.1.1
)

0 comments on commit 398077a

Please sign in to comment.