From 2fbcfc68d2b8f948053f02f73f6e01a7fb7724cb Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Wed, 15 Jan 2020 18:00:41 -0500 Subject: Removing vendor/ folder Signed-off-by: Dave Henderson --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f054e727..e04dff0c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ extension = $(patsubst windows,.exe,$(filter windows,$(1))) GO := go PKG_NAME := gomplate PREFIX := . -GOFLAGS := -mod=vendor ifeq ("$(CI)","true") LINT_PROCS ?= 1 @@ -68,7 +67,6 @@ docker-images: gomplate.iid gomplate-slim.iid $(PREFIX)/bin/$(PKG_NAME)_%: $(shell find $(PREFIX) -type f -name "*.go") GOOS=$(shell echo $* | cut -f1 -d-) GOARCH=$(shell echo $* | cut -f2 -d- | cut -f1 -d.) CGO_ENABLED=0 \ - GOFLAGS=$(GOFLAGS) \ $(GO) build \ -ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG)" \ -o $@ \ @@ -81,14 +79,14 @@ build: $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS)) ifeq ($(OS),Windows_NT) test: - @GOFLAGS=$(GOFLAGS) $(GO) test -v -coverprofile=c.out ./... + $(GO) test -v -coverprofile=c.out ./... else test: - @GOFLAGS=$(GOFLAGS) $(GO) test -v -race -coverprofile=c.out ./... + $(GO) test -v -race -coverprofile=c.out ./... endif integration: build - @GOFLAGS=$(GOFLAGS) $(GO) test -v -tags=integration \ + $(GO) test -v -tags=integration \ ./tests/integration integration.iid: Dockerfile.integration $(PREFIX)/bin/$(PKG_NAME)_linux-amd64$(call extension,$(GOOS)) -- cgit v1.2.3