From fa1cf198a7c22a0f7537c565e36a19567bbde0d8 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <mail@abhinavg.net>
Date: Wed, 2 Jan 2019 16:36:04 -0800
Subject: Upgrade to Go 1.11 and use modules (#33)

This commit modernizes the repository organization a bit.

In short, this,

- Upgrades to Go 1.11.
- Uses Go modules instead of Glide.
- Drops errcheck, which we rarely use in our codebase internally.
- Uses `./...` to run build, tests, etc. since that does not have to
  account for vendor anymore.
- Drops `-installsuffix cgo` from the production build. This was a
  workaround for pre-1.10 versions of Go. See
  https://github.com/golang/go/issues/9344#issuecomment-69944514.
- Uses a tools.go as recommended in [go-modules-by-example/tools][1] to
  pin to tool dependencies.
- Uses `go run` instead of `go install`ing tools globally.

[1]: https://github.com/go-modules-by-example/index/tree/master/010_tools

Tested locally with `make docker-launch`.
---
 Makefile | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 43bae42..7c25a34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,38 @@
-PKGS := $(shell go list ./... | grep -v go.uber.org/sally/vendor)
-SRCS := $(wildcard *.go)
+GOLINT = go run github.com/golang/lint/golint
+STATICCHECK = go run honnef.co/go/tools/cmd/staticcheck
 
 .PHONY: all
 all: test
 
-.PHONY: vendor-update
-vendor-update:
-	go get -v github.com/Masterminds/glide
-	glide update
-
-.PHONY: vendor-install
-vendor-install:
-	go get -v github.com/Masterminds/glide
-	glide install
-
 .PHONY: build
 build:
-	go build $(PKGS)
+	go build
 
 .PHONY: install
 install:
-	go install $(PKGS)
+	go install .
 
 .PHONY: lint
 lint:
-	go install ./vendor/github.com/golang/lint/golint
-	for file in $(SRCS); do \
-		golint $$file; \
-		if [ -n "$$(golint $$file)" ]; then \
-			exit 1; \
-		fi; \
-	done
+	$(GOLINT) ./...
 
 .PHONY: vet
 vet:
-	go vet $(PKGS)
-
-.PHONY: errcheck
-errcheck:
-	go install ./vendor/github.com/kisielk/errcheck
-	errcheck $(PKGS)
+	go vet ./...
 
 .PHONY: staticcheck
 staticcheck:
-	go install ./vendor/honnef.co/go/tools/cmd/staticcheck
-	staticcheck $(PKGS)
+	$(STATICCHECK) -tests=false ./...
 
 .PHONY: pretest
-pretest: lint vet errcheck staticcheck
+pretest: lint vet staticcheck
 
 .PHONY: test
 test: pretest
-	go test -race $(PKGS)
+	go test -race ./...
 
 .PHONY: clean
 clean:
-	go clean -i $(PKGS)
 	rm -rf _tmp
 
 .PHONY: docker-build-dev
@@ -70,7 +47,7 @@ docker-test: docker-build-dev
 docker-build-internal:
 	rm -rf _tmp
 	mkdir -p _tmp
-	CGO_ENABLED=0 go build -a -installsuffix cgo -o _tmp/sally $(SRCS)
+	CGO_ENABLED=0 go build -a -o _tmp/sally .
 	docker build -t uber/sally -f Dockerfile.scratch .
 
 .PHONY: docker-build
-- 
cgit v1.2.3