From cb231dbfa4a8a26c1ba7c0c5312e095e8114877a Mon Sep 17 00:00:00 2001 From: Ryan King Date: Mon, 16 Sep 2019 08:57:52 -0700 Subject: [PATCH] force vendor (#27) force vendor --- .travis.yml | 4 ++-- Makefile | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d7e901c..a0a35d36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ dist: trusty language: go install: -- curl -fSL --retry 5 https://github.com/gobuffalo/packr/releases/download/v1.13.1/packr_1.13.1_linux_amd64.tar.gz | sudo tar zx -C /usr/bin/ + - curl -fSL --retry 5 https://github.com/gobuffalo/packr/releases/download/v1.13.1/packr_1.13.1_linux_amd64.tar.gz | sudo tar zx -C /usr/bin/ jobs: include: - stage: test - script: make test + script: make test-ci diff --git a/Makefile b/Makefile index 93d15e03..c885aeae 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,26 @@ +export GOFLAGS=-mod=vendor +export GO111MODULE=on + build: packr @CGO_ENABLED=0 GOOS=linux go build -o terraform-provider-bless +.PHONY: build + +test: deps packr + @TF_ACC=yes go test -cover -v ./... +.PHONY: test -test: packr +test-ci: packr @TF_ACC=yes go test -cover -v ./... +.PHONY: test-ci + +deps: + go mod tidy + go mod vendor +.PHONY: deps packr: clean packr +.PHONY: packr clean: ## clean the repo rm terraform-provider-bless 2>/dev/null || true @@ -13,11 +28,10 @@ clean: ## clean the repo rm -rf dist 2>/dev/null || true packr clean rm coverage.out 2>/dev/null || true - +.PHONY: clean release: ## run a release bff bump git push goreleaser release --rm-dist - -.PHONY: build test packr release +.PHONY: release \ No newline at end of file