Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Go 1.13.7 #7262

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Switch to Go 1.13.7 #7262

merged 1 commit into from
Feb 12, 2020

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented Feb 11, 2020

Fixes #6879

@rboyer rboyer added this to the 1.7.x milestone Feb 11, 2020
@rboyer rboyer requested review from alvin-huang and a team February 11, 2020 18:10
@rboyer rboyer self-assigned this Feb 11, 2020
@@ -10,13 +10,6 @@ GOTOOLS = \
github.com/vektra/mockery/cmd/mockery

GOTAGS ?=
GOMODULES ?= ./... ./api/... ./sdk/...
GOFILES ?= $(shell go list $(GOMODULES) | grep -v /vendor/)
ifeq ($(origin GOTEST_PKGS_EXCLUDE), undefined)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the GOTEST_PKGS_EXCLUDE feature completely rather than figure out how to use that to omit some packages from all 3 submodules and then check to see if we can omit one or more of the submodules completely from tests. Seems like you're better off just doing go test manually at that point then having a crazy bash one liner nested inside of some make targets.

GNUmakefile Show resolved Hide resolved
go tool cover -html=coverage.out

test: other-consul dev-build vet test-install-deps test-internal

test-install-deps:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go modules has us covered now.

agent/cache/cache_test.go Outdated Show resolved Hide resolved
agent/cache/cache_test.go Outdated Show resolved Hide resolved
agent/consul/rpc.go Outdated Show resolved Hide resolved
@rboyer rboyer marked this pull request as ready for review February 11, 2020 18:28
gotestsum --format=short-verbose --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- -tags=$GOTAGS -cover -coverprofile=cov_sdk.part $PACKAGE_NAMES

# save coverage report parts
- persist_to_workspace:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice to see these coverage reports all merge together and just work. I wasn't sure if it would.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't check that it actually did something sane with the output.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did! If you grab the artifact from here: https://circleci.com/gh/hashicorp/consul/129822#artifacts/containers/0 you can browse to the api and sdk packages to check coverage.

Copy link
Member

@mkeeler mkeeler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@alvin-huang alvin-huang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few changes in the makefile that are issues from a glance (I didn't run locally).

GNUmakefile Show resolved Hide resolved
Copy link
Collaborator

@alvin-huang alvin-huang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

- You can no longer cross submodule boundaries with ./... in go
  subcommands like `go list` or `go test`. The makefile and CI scripts
  were updated accordingly.

- Also of note: `go mod vendor` now omits things build ignored.
@rboyer rboyer merged commit fdb6b80 into master Feb 12, 2020
@rboyer rboyer deleted the go-1.13.7 branch February 12, 2020 16:15
@rboyer rboyer mentioned this pull request Mar 10, 2020
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support Go 1.13
3 participants