Skip to content

bump gotest.tools v3.0.1 for compatibility with Go 1.14#40472

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_gotest_tools_v3.0.1
Feb 11, 2020
Merged

bump gotest.tools v3.0.1 for compatibility with Go 1.14#40472
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_gotest_tools_v3.0.1

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Feb 7, 2020

@thaJeztah thaJeztah mentioned this pull request Feb 7, 2020
Merged
20 tasks
@thaJeztah thaJeztah changed the title bump gotest.tools v3.0.1 for compatibility with Go 1.14 [hold] bump gotest.tools v3.0.1 for compatibility with Go 1.14 Feb 7, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 7, 2020

Added "HOLD"; probably easier to merge #40473 first, as that one will conflict with this one

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 7, 2020

Hm; looks like something went wrong re-vendoring;


[2020-02-07T14:11:37.806Z] The result of vndr differs
[2020-02-07T14:11:37.806Z] 
[2020-02-07T14:11:37.806Z]  D vendor/gotest.tools/LICENSE
[2020-02-07T14:11:37.806Z]  D vendor/gotest.tools/README.md
[2020-02-07T14:11:37.806Z]  D vendor/gotest.tools/go.mod

I'll remove them manually

@thaJeztah thaJeztah force-pushed the bump_gotest_tools_v3.0.1 branch from c758412 to b45110b Compare February 7, 2020 15:21
@thaJeztah thaJeztah force-pushed the bump_gotest_tools_v3.0.1 branch from b45110b to 9f0b3f5 Compare February 10, 2020 23:06
@thaJeztah thaJeztah changed the title [hold] bump gotest.tools v3.0.1 for compatibility with Go 1.14 bump gotest.tools v3.0.1 for compatibility with Go 1.14 Feb 10, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 10, 2020

@cpuguy83 @tiborvass @AkihiroSuda this should be ready for review

cpuguy83
cpuguy83 approved these changes Feb 10, 2020
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit d96f61c into moby:master Feb 11, 2020
AkihiroSuda
AkihiroSuda reviewed Feb 11, 2020
View reviewed changes
pkg/authorization/api_test.go
func TestPeerCertificateMarshalJSON(t *testing.T) {
template := &x509.Certificate{
IsCA: true,
IsCA: true,
Copy link
Member

@AkihiroSuda AkihiroSuda Feb 11, 2020

Choose a reason for hiding this comment

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

Why?
Seems causing goimports error: #40501

Copy link
Member Author

@thaJeztah thaJeztah Feb 11, 2020

Choose a reason for hiding this comment

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

Ugh, sorry about that; I suspect this has been my IDE formatting it (perhaps different go version?)

Also curious why CI didn't catch it

@AkihiroSuda AkihiroSuda mentioned this pull request Feb 11, 2020
Merged
@thaJeztah thaJeztah deleted the bump_gotest_tools_v3.0.1 branch February 11, 2020 13:32
@thaJeztah thaJeztah mentioned this pull request Feb 11, 2020
Merged
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
@thaJeztah thaJeztah mentioned this pull request Apr 6, 2020
Merged
@thaJeztah thaJeztah mentioned this pull request Jul 31, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tonistiigi tonistiigi Awaiting requested review from tonistiigi tonistiigi is a code owner

Assignees

No one assigned

Labels

area/testing status/4-merge

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @cpuguy83 @AkihiroSuda