From 4bef33eaa9f26fd4dfe324dfd2a1853fae2e5edc Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Mon, 4 Feb 2019 08:56:32 -0600 Subject: [PATCH] Address code review feedback --- CONTRIBUTING.md | 10 ++-------- Makefile | 3 ++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3939e927e..93e4854f5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,12 +41,6 @@ If you want to help but you aren't sure where to start, check out our [github la cd ${GOPATH}/src/github.com/pilosa/pilosa ``` -- [Install](https://github.com/golang/dep/#installation) `dep` to manage dependencies: - - ```sh - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh - ``` - - Install Pilosa command line tools: ```sh @@ -56,7 +50,7 @@ If you want to help but you aren't sure where to start, check out our [github la or ``` - dep ensure && go install github.com/pilosa/pilosa/cmd/... + go install github.com/pilosa/pilosa/cmd/... ``` Running `pilosa` should now run a Pilosa instance. @@ -78,7 +72,7 @@ Pilosa includes a Makefile that automates several tasks: make install ``` -- Install build dependencies (dep and protoc): +- Install build dependencies: ```sh make install-build-deps diff --git a/Makefile b/Makefile index c9226de17..8a76a34e5 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ RELEASE ?= 0 RELEASE_ENABLED = $(subst 0,,$(RELEASE)) BUILD_TAGS += $(if $(ENTERPRISE_ENABLED),enterprise) BUILD_TAGS += $(if $(RELEASE_ENABLED),release) +export GO111MODULE=on # Run tests and compile Pilosa default: test build @@ -157,7 +158,7 @@ require-%: $(info Verified build dependency "$*" is installed.),\ $(error Build dependency "$*" not installed. To install, try `make install-$*`)) -install-build-deps: install-dep install-protoc-gen-gofast install-protoc install-stringer install-peg +install-build-deps: install-protoc-gen-gofast install-protoc install-stringer install-peg install-stringer: go get -u golang.org/x/tools/cmd/stringer