From 8f2a24298d6cb25a2152d63b615153d736c8681b Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 25 Jul 2018 17:30:29 +0200 Subject: [PATCH] fixed makefile + lint & fmt --- Makefile | 2 +- routes/api/v1/login.go | 2 +- routes/api/v1/token_check.go | 2 +- routes/crud/read_one.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b0cfc457a..58397dfe5 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ EXTRA_GOFLAGS ?= LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" -PACKAGES ?= $(filter-out code.vikunja.io/api/integrations,$(shell go vikunja ./... | grep -v /vendor/)) +PACKAGES ?= $(filter-out code.vikunja.io/api/integrations,$(shell go list ./... | grep -v /vendor/)) SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= diff --git a/routes/api/v1/login.go b/routes/api/v1/login.go index 6dfc21b61..d98080a1f 100644 --- a/routes/api/v1/login.go +++ b/routes/api/v1/login.go @@ -1,9 +1,9 @@ package v1 import ( + "code.vikunja.io/api/models" "crypto/md5" "encoding/hex" - "code.vikunja.io/api/models" "github.com/dgrijalva/jwt-go" "github.com/labstack/echo" "net/http" diff --git a/routes/api/v1/token_check.go b/routes/api/v1/token_check.go index 943d7e2e3..f35aab90e 100644 --- a/routes/api/v1/token_check.go +++ b/routes/api/v1/token_check.go @@ -1,8 +1,8 @@ package v1 import ( - "fmt" "code.vikunja.io/api/models" + "fmt" "github.com/dgrijalva/jwt-go" "github.com/labstack/echo" ) diff --git a/routes/crud/read_one.go b/routes/crud/read_one.go index 418c40e56..56dc1d660 100644 --- a/routes/crud/read_one.go +++ b/routes/crud/read_one.go @@ -1,8 +1,8 @@ package crud import ( - "fmt" "code.vikunja.io/api/models" + "fmt" "github.com/labstack/echo" "net/http" )