From 6e872fc40b24c06919379b92c738b51ee1706018 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 26 Feb 2019 15:25:22 +0100 Subject: [PATCH 1/8] .circleci/config.yml: use go 1.12 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 075bd0741..17ad2f3f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,8 +5,8 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.11 + - image: circleci/golang:1.12 working_directory: /go/src/github.com/hashicorp/packer steps: - checkout - - run: make ci \ No newline at end of file + - run: make ci From 662f2f845a4637e4b87211f97c4a595203394a2c Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 26 Feb 2019 15:27:28 +0100 Subject: [PATCH 2/8] travis.yml: use go 1.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1be948a43..d2def5ca5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ sudo: false language: go go: - - 1.11.x + - 1.12.x - master before_install: From 9c9d5cd688ee98fb0f27b89f8d17834b0c7a2531 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 26 Feb 2019 15:28:41 +0100 Subject: [PATCH 3/8] Update appveyor.yml remove obsolete setenv --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 46c99bcc8..90e08ad71 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,6 @@ environment: clone_folder: c:\gopath\src\github.com\hashicorp\packer install: - - set GO15VENDOREXPERIMENT=1 - echo %Path% - go version - go env From 07dfab5e3c65679f6213f00bbb2d95d9096710e0 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Tue, 26 Feb 2019 15:34:43 +0100 Subject: [PATCH 4/8] use golang:1.12 instead of cicleci/golang:1.12 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17ad2f3f7..e5c9b6415 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.12 + - image: golang:1.12 working_directory: /go/src/github.com/hashicorp/packer steps: - checkout From c4b28d6ddc9d77a47c590c02fbe35371e23dd76f Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 27 Feb 2019 08:08:58 +0100 Subject: [PATCH 5/8] Revert "use golang:1.12 instead of cicleci/golang:1.12" This reverts commit 6381f31113c59f4c73336a74f6078adacbd9cef6. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5c9b6415..17ad2f3f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ version: 2 jobs: build: docker: - - image: golang:1.12 + - image: circleci/golang:1.12 working_directory: /go/src/github.com/hashicorp/packer steps: - checkout From e9990e8876ee1e51578d3aec6d177c3bf892a11c Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 27 Feb 2019 10:21:10 +0100 Subject: [PATCH 6/8] use `go vet` instead of `go tool vet` https://golang.org/doc/go1.12#vet --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c0c86a307..770cac7a4 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ updatedeps: @echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md" vet: ## Vet Go code - @go tool vet $(VET) ; if [ $$? -eq 1 ]; then \ + @go vet $(VET) ; if [ $$? -eq 1 ]; then \ echo "ERROR: Vet found problems in the code."; \ exit 1; \ fi From b842adcffd0f8d1d892162dc1b7c5cb823379f18 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 27 Feb 2019 10:37:10 +0100 Subject: [PATCH 7/8] Update Makefile make sure we use "go list ./..." * without removing vendor dir as it is now removed by default. * stop using ls -d */ --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 770cac7a4..feaa63913 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -TEST?=$(shell go list ./... | grep -v vendor) -VET?=$(shell ls -d */ | grep -v vendor | grep -v website) +TEST?=$(shell go list ./...) +VET?=$(shell go list ./...) # Get the current full sha from git GITSHA:=$(shell git rev-parse HEAD) # Get the current local branch name from git (if we can, this may be blank) From fef25e0b246cc509b9dfe122ff272b805236b0df Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 4 Mar 2019 11:18:00 +0100 Subject: [PATCH 8/8] Revert "remove vet which seems to have been broken in golang v1.12" This reverts commit 58f0b8c22ebb7ec309f6178860e29007c1913e8e. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index feaa63913..4c72465cb 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ generate: deps ## Generate dynamically generated code goimports -w common/bootcommand/boot_command.go gofmt -w command/plugin.go -test: fmt-check mode-check ## Run unit tests +test: fmt-check mode-check vet ## Run unit tests @go test $(TEST) $(TESTARGS) -timeout=2m # testacc runs acceptance tests