From 3f30ec4694ce2f42175b3edf9933dec7034c925e Mon Sep 17 00:00:00 2001
From: Katrina Rogan <krogan@lyft.com>
Date: Mon, 13 Apr 2020 10:50:34 -0700
Subject: [PATCH] Update to latest boilerplate and remove duplicate codecov
 target (#108)

---
 Makefile                                       |  5 -----
 boilerplate/lyft/golang_support_tools/tools.go |  2 +-
 boilerplate/lyft/golang_test_targets/Makefile  | 12 +++++++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index bc2f0c58dd..04e0ca1964 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,6 @@ golden:
 	go test ./cmd/kubectl-flyte/cmd -update
 	go test ./pkg/compiler/test -update
 
-.PHONY: test_unit_codecov
-test_unit_codecov:
-	go test ./... -race -coverprofile=coverage.txt -covermode=atomic
-	curl -s https://codecov.io/bash > codecov_bash.sh && bash codecov_bash.sh
-
 .PHONY: generate
 generate: download_tooling
 	@go generate ./...
diff --git a/boilerplate/lyft/golang_support_tools/tools.go b/boilerplate/lyft/golang_support_tools/tools.go
index 88ff645233..4310b39d79 100644
--- a/boilerplate/lyft/golang_support_tools/tools.go
+++ b/boilerplate/lyft/golang_support_tools/tools.go
@@ -3,8 +3,8 @@
 package tools
 
 import (
-	_ "github.com/alvaroloes/enumer"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "github.com/lyft/flytestdlib/cli/pflags"
 	_ "github.com/vektra/mockery/cmd/mockery"
+	_ "github.com/alvaroloes/enumer"
 )
diff --git a/boilerplate/lyft/golang_test_targets/Makefile b/boilerplate/lyft/golang_test_targets/Makefile
index 529b79bd1d..5abd2ed607 100644
--- a/boilerplate/lyft/golang_test_targets/Makefile
+++ b/boilerplate/lyft/golang_test_targets/Makefile
@@ -39,9 +39,15 @@ test_benchmark:
 
 .PHONY: test_unit_cover
 test_unit_cover:
-	go test ./... -coverprofile /tmp/cover.out -covermode=count; go tool cover -func /tmp/cover.out
+	go test ./... -coverprofile /tmp/cover.out -covermode=count
+	go tool cover -func /tmp/cover.out
 
 .PHONY: test_unit_visual
 test_unit_visual:
-	go test ./... -coverprofile /tmp/cover.out -covermode=count; go tool cover -html=/tmp/cover.out 
-
+	go test ./... -coverprofile /tmp/cover.out -covermode=count
+	go tool cover -html=/tmp/cover.out
+	
+.PHONY: test_unit_codecov
+test_unit_codecov:
+	go test ./... -race -coverprofile=coverage.txt -covermode=atomic
+	curl -s https://codecov.io/bash > codecov_bash.sh && bash codecov_bash.sh