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

[17.06 backport] Fix gosimple, and update to Golang 1.10.7 #2330

Merged
merged 3 commits into from
Jan 24, 2019

Conversation

thaJeztah
Copy link
Member

backport of #2320 for the 17.06 branch

git checkout -b 17.06_backport_fix_build upstream/bump_17.06
git cherry-pick -s -S -x fd6be31abb9a44a61286cbc4671519086cc313cb

@thaJeztah
Copy link
Member Author

Hm.. interesting

# golang.org/x/tools/go/internal/gcimporter
src/golang.org/x/tools/go/internal/gcimporter/bexport.go:212: obj.IsAlias undefined (type *types.TypeName has no field or method IsAlias)
# golang.org/x/tools/go/internal/packagesdriver
src/golang.org/x/tools/go/internal/packagesdriver/sizes.go:94: undefined: types.SizesFor

Ah, it's because Go 1.8 is no longer supported; golang/go#28291 (comment)

And we fetch the linters with go get, so there's no idea what they'll fetch

thaJeztah and others added 2 commits January 23, 2019 21:17
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Flavio Crisciani <[email protected]>
(cherry picked from commit fd6be31)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 17.06_backport_fix_build branch from e07c699 to 599579e Compare January 23, 2019 20:17
@thaJeztah
Copy link
Member Author

Added a commit to bump Go to 1.10 (which is now also the version used when building 17.06)

@thaJeztah
Copy link
Member Author

Almost there;

network.go:391:12: assigning the result of this type assertion to a variable (switch data := data.(type)) could eliminate the following type assertions:
	/go/src/github.com/docker/libnetwork/network.go:393:13
	/go/src/github.com/docker/libnetwork/network.go:395:13 (S1034)

This takes the gosimple linting fix from 1954e1c

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

Added a commit with just the linting fix from #2325

@thaJeztah thaJeztah changed the title [17.06 backport] Fix gosimple [17.06 backport] Fix gosimple, and update to Golang 1.10.7 Jan 23, 2019
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani fcrisciani merged commit 9bee1f2 into moby:bump_17.06 Jan 24, 2019
@thaJeztah thaJeztah deleted the 17.06_backport_fix_build branch January 24, 2019 01:02
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.

2 participants