udpate CI for cross-platform testing

Author: kmoe

.travis.yml

@@ -1,42 +1,31 @@
 language: go
 go:
-  - "1.11.x"
+  - stable
+  - tip
 jobs:
   include:
     - os: linux
       dist: trusty
       sudo: required
       services:
         - docker
-      before_script:
-        - curl -fSL "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip" -o terraform.zip
-        - sudo unzip terraform.zip -d /opt/terraform
-        - sudo ln -s /opt/terraform/terraform /usr/bin/terraform
-        - rm -f terraform.zip
       script:
         - make test
         - make testacc
         - make vet
-        - make website-test
     - os: osx
       script:
         - make test
         - make testacc
-      before_script:
-        - curl -fSL "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_darwin_amd64.zip" -o terraform.zip
-        - sudo unzip terraform.zip -d /opt/terraform
-        - sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform
-        - rm -f terraform.zip
     - os: windows
       script:
-        # TODO: ensure windows setup can support binary testing
-        - TF_ACC=1 TF_ACC_TERRAFORM_PATH=/c/Users/travis/bin/terraform go test -v ./...
+        - TF_ACC=1 go test -v ./...
       before_script:
         - curl -fSL "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_windows_amd64.zip" -o terraform.zip
         - unzip terraform.zip -d /c/Users/travis/bin
 
 env:
-  - GO111MODULE=on GOFLAGS=-mod=vendor TF_VERSION=0.12.26
+  - GO111MODULE=on GOFLAGS=-mod=vendor TF_VERSION=0.13.3
 
 install:
 # This script is used by the Travis build to install a cookie for

GNUmakefile

@@ -1,6 +1,5 @@
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
-WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=archive
 
 default: build
@@ -43,19 +42,4 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
-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  test-compile website website-test
-
+.PHONY: build test testacc vet fmt fmtcheck errcheck  test-compile