Merge pull request nutanix#117 from terraform-providers/improved-travis

Improved travis

.gitignore

@@ -19,6 +19,9 @@ terraform-provider-nutanix
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+#exclude vendor
+!vendor/**
+
 # autogenerated fies
 *.autogenerated.*
 

.golangci.yml

@@ -46,14 +46,20 @@ linters:
     - gocognit
     - godox
     - wsl
+    - nestif
+    - godot
 
 issues:
   exclude:
     - composite literal uses unkeyed fields
+  exclude-rules:
+    - path: _test\.go
+      linters:
+          - testpackage
       # part of the golangci govet package is picking up things that go vet doesn't. Seems flaky, shutting that specific error off
 
 run:
   # which dirs to skip: they won't be analyzed;
   skip-dirs:
     - vendor
-    - future
+    - future

.travis.yml

@@ -3,34 +3,26 @@ sudo: required
 services:
   - docker
 language: go
-go:
-  - "1.12.x"
 
-git:
-  depth: 1
-
-
-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
-# packages that live there.
-# See: https://github.com/golang/go/issues/12933
-- bash scripts/gogetcookie.sh
-- make tools
-
-script:
-- make lint
-- make test
-- make website-lint
-- make website-test
-
-#branches:
-#  only:
-#  - master
-
 matrix:
   fast_finish: true
   allow_failures:
   - go: tip
+  include:
+  - go: "1.13.x"
+    name: "Code Lint"
+    script: make lint
+  - go: "1.13.x"
+    name: "Code UnitTest"
+    script: make test
+  - go: "1.13.x"
+    name: "Website"
+     #- make website-test #commented until Terraform Provider Program Validation
+    script: make website-lint
+
 env:
-  - GOFLAGS=-mod=vendor GO111MODULE=on
+  global:
+    - GOFLAGS=-mod=vendor
+
+install:
+- make tools

GNUmakefile

@@ -10,7 +10,7 @@ build: fmtcheck
 
 test: fmtcheck
 	go test $(TEST) -timeout=30s -parallel=4
-	
+
 testacc: fmtcheck
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -coverprofile c.out
 	go tool cover -html=c.out
@@ -32,9 +32,9 @@ lint: fmtcheck
 	@GOGC=30 golangci-lint run --timeout=30m
 
 tools:
-	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
-	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
-	GO111MODULE=off go get github.com/mitchellh/gox	
+	GO111MODULE=on go install github.com/client9/misspell/cmd/misspell
+	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint
+	GO111MODULE=on go install github.com/mitchellh/gox
 
 vet:
 	@echo "go vet ."

go.mod

@@ -1,12 +1,10 @@
 module github.com/terraform-providers/terraform-provider-nutanix
 
 require (
-	github.com/gogo/protobuf v1.2.0
-	github.com/golang/protobuf v1.3.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/client9/misspell v0.3.4
+	github.com/golangci/golangci-lint v1.25.0
 	github.com/hashicorp/terraform v0.12.3
-	github.com/mattn/go-isatty v0.0.7 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/gox v1.0.1
 	github.com/spf13/afero v1.2.2 // indirect
 )
 

tools.go

@@ -0,0 +1,9 @@
+// +build tools
+
+package main
+
+import (
+	_ "github.com/client9/misspell/cmd/misspell"
+	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	_ "github.com/mitchellh/gox"
+)