From 910ece3f1e9322ae2126ca4328b67f4b6ac66f7c Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 27 Apr 2018 16:58:48 +0100 Subject: [PATCH] make: Add website + website-test targets --- .travis.yml | 7 +++++-- GNUmakefile | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e49c405..72b533be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ dist: trusty -sudo: false +sudo: required language: go +services: +- docker +- mysql go: - 1.8.1 -services: mysql install: # This script is used by the Travis build to install a cookie for # go.googlesource.com so rate limits are higher when using `go get` to fetch @@ -18,6 +20,7 @@ script: - make test - make vendor-status - make vet +- make website-test - export MYSQL_USERNAME=root - export MYSQL_ENDPOINT=localhost:3306 - export MYSQL_PASSWORD= diff --git a/GNUmakefile b/GNUmakefile index c9eacb45..a2dd0613 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=mysql 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