From 0aeae37fcc4d18d7ef414a3ce04f299235a3cd6d Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 27 Apr 2018 16:58:23 +0100 Subject: [PATCH] make: Add website + website-test targets --- .travis.yml | 5 ++++- GNUmakefile | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ba1993..0eabb81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ dist: trusty -sudo: false +sudo: required +services: +- docker language: go go: - 1.8.1 @@ -16,6 +18,7 @@ script: - make test - make vendor-status - make vet +- make website-test branches: only: diff --git a/GNUmakefile b/GNUmakefile index c9eacb4..902b3d1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,5 +1,7 @@ TEST?=$$(go list ./... |grep -v 'vendor') GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor) +WEBSITE_REPO=github.com/hashicorp/terraform-website +PKG_NAME=librato default: build @@ -38,10 +40,24 @@ vendor-status: test-compile: @if [ "$(TEST)" = "./..." ]; then \ echo "ERROR: Set TEST to a specific package. For example,"; \ - echo " make test-compile TEST=./aws"; \ + echo " make test-compile TEST=./$(PKG_NAME)"; \ exit 1; \ fi go test -c $(TEST) $(TESTARGS) -.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile +website: +ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) + echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." + git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) +endif + @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) + +website-test: +ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) + echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." + git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) +endif + @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) + +.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test