Merge pull request #7348 from hashicorp/go-1.12

ci: run using go 1.12
This commit is contained in:
Adrien Delorme 2019-03-04 11:34:50 +01:00 committed by GitHub
commit 2a39dad5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions

View File

@ -5,7 +5,7 @@ version: 2
jobs: jobs:
build: build:
docker: docker:
- image: circleci/golang:1.11 - image: circleci/golang:1.12
working_directory: /go/src/github.com/hashicorp/packer working_directory: /go/src/github.com/hashicorp/packer
steps: steps:
- checkout - checkout

View File

@ -11,7 +11,7 @@ sudo: false
language: go language: go
go: go:
- 1.11.x - 1.12.x
- master - master
before_install: before_install:

View File

@ -1,5 +1,5 @@
TEST?=$(shell go list ./... | grep -v vendor) TEST?=$(shell go list ./...)
VET?=$(shell ls -d */ | grep -v vendor | grep -v website) VET?=$(shell go list ./...)
# Get the current full sha from git # Get the current full sha from git
GITSHA:=$(shell git rev-parse HEAD) GITSHA:=$(shell git rev-parse HEAD)
# Get the current local branch name from git (if we can, this may be blank) # Get the current local branch name from git (if we can, this may be blank)
@ -101,7 +101,7 @@ generate: deps ## Generate dynamically generated code
goimports -w common/bootcommand/boot_command.go goimports -w common/bootcommand/boot_command.go
gofmt -w command/plugin.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 @go test $(TEST) $(TESTARGS) -timeout=2m
# testacc runs acceptance tests # testacc runs acceptance tests
@ -116,7 +116,7 @@ updatedeps:
@echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md" @echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md"
vet: ## Vet Go code 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."; \ echo "ERROR: Vet found problems in the code."; \
exit 1; \ exit 1; \
fi fi

View File

@ -16,7 +16,6 @@ environment:
clone_folder: c:\gopath\src\github.com\hashicorp\packer clone_folder: c:\gopath\src\github.com\hashicorp\packer
install: install:
- set GO15VENDOREXPERIMENT=1
- echo %Path% - echo %Path%
- go version - go version
- go env - go env