From 78542e85c6673a8993337d1b8dc87b2df9e7c907 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Mon, 7 Oct 2019 15:52:54 -0700 Subject: [PATCH] gomodules: final switch --- Gopkg.toml | 3 --- Makefile | 16 +++------------- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 Gopkg.toml diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 5c879c7d..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,3 +0,0 @@ -[prune] - go-tests = true - unused-packages = true diff --git a/Makefile b/Makefile index 851bb6ed..a052be5c 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,10 @@ MAKEFLAGS += --warn-undefined-variables SHELL := /bin/bash -o pipefail -PROJECT_SHA ?= $(shell git rev-parse HEAD) -PROJECT_VERSION ?= $(lastword $(shell git tag --sort version:refname --merged $(shell git rev-parse --abbrev-ref HEAD))) -PROJECT_RELEASE ?= dev +export GO111MODULE = on +export GOPRIVATE = '*' -# Until we support go.mod properly -export GO111MODULE = off - -ci: init lint test codecov - -init: - go get -u github.com/aporeto-inc/go-bindata/... - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint - dep ensure - dep status +ci: lint test codecov lint: # --enable=unparam