diff --git a/.travis.yml b/.travis.yml index 023ef7b6b..f814f1298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ env: - - USER=travis + - USER=travis GO111MODULE=off os: - windows diff --git a/Makefile b/Makefile index 1b84d0c9c..e84073a73 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ release: deps test releasebin package ## Build a release build bin: deps ## Build debug/test build @go get github.com/mitchellh/gox @echo "WARN: 'make bin' is for debug / test builds only. Use 'make release' for release builds." - @sh -c "$(CURDIR)/scripts/build.sh" + @GO111MODULE=off sh -c "$(CURDIR)/scripts/build.sh" releasebin: deps @go get github.com/mitchellh/gox @@ -40,7 +40,7 @@ releasebin: deps echo "ERROR: You must remove prerelease tags from version/version.go prior to release."; \ exit 1; \ fi - @sh -c "$(CURDIR)/scripts/build.sh" + @GO111MODULE=off sh -c "$(CURDIR)/scripts/build.sh" package: $(if $(VERSION),,@echo 'VERSION= needed to release; Use make package skip compilation'; exit 1) @@ -50,7 +50,6 @@ deps: @go get golang.org/x/tools/cmd/goimports @go get golang.org/x/tools/cmd/stringer @go get -u github.com/mna/pigeon - @go get github.com/kardianos/govendor dev: deps ## Build and install a development build @grep 'const VersionPrerelease = ""' version/version.go > /dev/null ; if [ $$? -eq 0 ]; then \ @@ -110,10 +109,10 @@ testacc: deps generate ## Run acceptance tests PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m testrace: fmt-check mode-check vet ## Test with race detection enabled - @go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8 + @GO111MODULE=off go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8 updatedeps: - @echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md" + @echo "INFO: Packer deps are managed by go modules. See .github/CONTRIBUTING.md" vet: ## Vet Go code @go vet $(VET) ; if [ $$? -eq 1 ]; then \ diff --git a/appveyor.yml b/appveyor.yml index ce8dc1e3a..ac3863f5c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,7 @@ environment: clone_folder: c:\gopath\src\github.com\hashicorp\packer install: + - set GO111MODULE=off - echo %Path% - go version - go env