Skip to content

Commit

Permalink
Upgrade go compiler 1.13.4 -> 1.14.3 (hashicorp#6359)
Browse files Browse the repository at this point in the history
Also simplify `make test` command.
Remove `GO111MODULE=on` and `GOFLAGS=-mod=vendor` env vars, which are no
longer necessary in Go 1.14.
  • Loading branch information
ryboe authored Jun 2, 2020
1 parent a8af524 commit aecf30a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function tpgpatch1 {
git checkout $pr_username/$feature_branch
git format-patch $(git merge-base HEAD master)
}

function tpgpatch2 {
for patch in $GOPATH/src/github.com/terraform-providers/terraform-provider-google*/*.patch; do
echo "checking ${patch}"
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.13.4
1.14.3
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
language: go
go:
- "1.13.x"
- "1.14.x"

install:
# This script is used by the Travis build to install a cookie for
Expand Down
5 changes: 1 addition & 4 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ TEST?=$$(go list ./...)
WEBSITE_REPO=github.com/hashicorp/terraform-website
PKG_NAME=google

GO111MODULE=on

default: build

build: fmtcheck generate
go install

test: fmtcheck generate
go test $(TESTARGS) -timeout=30s -parallel=4 $(TEST)
go test $(TESTARGS) -timeout=30s $(TEST)

testacc: fmtcheck generate
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test $(TEST) -v $(TESTARGS) -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google/version.ProviderVersion=acc"
Expand Down Expand Up @@ -63,4 +61,3 @@ docscheck:
@sh -c "'$(CURDIR)/scripts/docscheck.sh'"

.PHONY: build test testacc vet fmt fmtcheck lint tools errcheck test-compile website website-test docscheck generate

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ for more details on how to use `google-beta`.
Upgrading the provider
----------------------

The Google provider doesn't upgrade automatically once you've started using it. After a new release you can run
The Google provider doesn't upgrade automatically once you've started using it. After a new release you can run

```bash
terraform init -upgrade
Expand Down Expand Up @@ -63,7 +63,7 @@ Developing the provider
---------------------------

If you wish to work on the provider, you'll first need [Go](http://www.golang.org)
installed on your machine (version 1.13.0+ is *required*). You can use [goenv](https://github.com/syndbg/goenv)
installed on your machine (version 1.14.0+ is *required*). You can use [goenv](https://github.com/syndbg/goenv)
to manage your Go version. You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH),
as well as adding `$GOPATH/bin` to your `$PATH`.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ require (
google.golang.org/api v0.25.0
)

go 1.13
go 1.14

0 comments on commit aecf30a

Please sign in to comment.