Merge pull request #1509 from venezia/fix-go-lint-v2

Adjusting Makefile so that `golint` will compile
This commit is contained in:
Nándor István Krácser 2019-08-03 13:56:20 +02:00 committed by GitHub
commit 526e078366
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@ PROJ=dex
ORG_PATH=github.com/dexidp ORG_PATH=github.com/dexidp
REPO_PATH=$(ORG_PATH)/$(PROJ) REPO_PATH=$(ORG_PATH)/$(PROJ)
export PATH := $(PWD)/bin:$(PATH) export PATH := $(PWD)/bin:$(PATH)
THIS_DIRECTORY:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
VERSION ?= $(shell ./scripts/git-version) VERSION ?= $(shell ./scripts/git-version)
@ -73,7 +74,7 @@ bin/protoc-gen-go:
@go install -v $(REPO_PATH)/vendor/github.com/golang/protobuf/protoc-gen-go @go install -v $(REPO_PATH)/vendor/github.com/golang/protobuf/protoc-gen-go
bin/golint: bin/golint:
@go install -v $(REPO_PATH)/vendor/golang.org/x/lint/golint @go install -v $(THIS_DIRECTORY)/vendor/golang.org/x/lint/golint
clean: clean:
@rm -rf bin/ @rm -rf bin/