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

vendor: github.com/docker/docker v23.0.1 #3124

Merged
merged 3 commits into from
Mar 9, 2023

Conversation

thaJeztah
Copy link
Member

vendor: github.com/onsi/ginkgo v1.16.4

full diff:

vendor: github.com/onsi/gomega v1.15.0

full diff: onsi/gomega@v1.10.5...v1.15.0

vendor: github.com/docker/docker v23.0.1

no changes in vendored code

full diff: moby/moby@v23.0.0...v23.0.1

- Description for the changelog

full diff:

- onsi/ginkgo@v1.12.1...v1.16.4
- nxadm/tail@v1.4.4...v1.4.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah marked this pull request as ready for review March 2, 2023 16:34
@thaJeztah
Copy link
Member Author

Wait; what happened? I think it was green the first time?

# github.com/moby/swarmkit/v2/manager/csi [github.com/moby/swarmkit/v2/manager/csi.test]
manager/csi/manager_test.go:9:2: Gomega redeclared in this block
	/go/src/github.com/docker/swarmkit/vendor/github.com/onsi/gomega/gomega_dsl.go:44:6: other declaration of Gomega
manager/csi/manager_test.go:9:2: Assertion redeclared in this block
	/go/src/github.com/docker/swarmkit/vendor/github.com/onsi/gomega/gomega_dsl.go:402:6: other declaration of Assertion
manager/csi/manager_test.go:9:2: AsyncAssertion redeclared in this block
	/go/src/github.com/docker/swarmkit/vendor/github.com/onsi/gomega/gomega_dsl.go:380:6: other declaration of AsyncAssertion
FAIL	github.com/moby/swarmkit/v2/manager/csi [build failed]

let me check

. "github.com/onsi/gomega/types"

"github.com/docker/go-events"
"github.com/onsi/gomega/types"
Copy link
Member Author

Choose a reason for hiding this comment

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

Changed it from a . import to a regular input (it was only used in a single place here)

@thaJeztah

This comment was marked as outdated.

full diff: onsi/gomega@v1.10.5...v1.15.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
no changes in vendored code

full diff: moby/moby@v23.0.0...v23.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

@dperny @neersighted @corhere ptal

@thaJeztah thaJeztah merged commit a745a87 into moby:master Mar 9, 2023
@thaJeztah thaJeztah deleted the update_engine_23.0.1 branch March 9, 2023 19:42
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.

None yet

3 participants