From bcd47fc6f37c7d51222faf248ed7a08e58448b81 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 18 Dec 2019 15:07:53 +0100 Subject: [PATCH] Remove old lint targets --- Makefile | 17 ++--------------- scripts/gofmt | 7 ------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100755 scripts/gofmt diff --git a/Makefile b/Makefile index c1c6d788..2c041408 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ PROJ=dex ORG_PATH=github.com/dexidp REPO_PATH=$(ORG_PATH)/$(PROJ) export PATH := $(PWD)/bin:$(PATH) -THIS_DIRECTORY:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) VERSION ?= $(shell ./scripts/git-version) @@ -62,15 +61,6 @@ lint: bin/golangci-lint ## Run linter fix: bin/golangci-lint ## Fix lint violations bin/golangci-lint run --fix -vet: - @go vet ./... - -fmt: - @./scripts/gofmt ./... - -oldlint: bin/golint - @./bin/golint -set_exit_status $(shell go list ./...) - .PHONY: docker-image docker-image: @sudo docker build -t $(DOCKER_IMAGE) . @@ -90,14 +80,11 @@ bin/protoc: scripts/get-protoc bin/protoc-gen-go: @go install -v $(REPO_PATH)/vendor/github.com/golang/protobuf/protoc-gen-go -bin/golint: - @go install -v $(THIS_DIRECTORY)/vendor/golang.org/x/lint/golint - clean: @rm -rf bin/ -testall: testrace vet fmt oldlint +testall: testrace FORCE: -.PHONY: test testrace vet fmt oldlint testall +.PHONY: test testrace testall diff --git a/scripts/gofmt b/scripts/gofmt deleted file mode 100755 index 8851bdab..00000000 --- a/scripts/gofmt +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -result=$( go fmt $@ ) -if [[ $result != "" ]]; then - >&2 echo "The following files are not formatted correctly: $result" - exit 1 -fi