Skip to content

Revendor github.com/Microsoft/hcsshim#3530

Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom
jterry75:revenor_hcsshim
Aug 21, 2019
Merged

Revendor github.com/Microsoft/hcsshim#3530
AkihiroSuda merged 1 commit intocontainerd:masterfrom
jterry75:revenor_hcsshim

Conversation

@jterry75
Copy link
Copy Markdown
Contributor

  1. Revendors github.com/Microsoft/hcsshim to the latest known good commit.
    This includes numerous bug fixes and improvements.

  2. Vendors indirect dependency on go.opencensus.io since hcsshim now uses trace
    correlation.

Signed-off-by: Justin Terry (VM) [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 14, 2019

Build succeeded.

Copy link
Copy Markdown

@abwah abwah left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp
Copy link
Copy Markdown
Member

estesp commented Aug 14, 2019

golangci-lint is failing only on Windows--maybe another dep that isn't accounted for, or?

level=error msg="Running error: context loading failed: failed to load program with go/packages: go [list -e -json -compiled=true -test=true -export=false -deps=true -find=false -- ./...]: exit status 1: go build github.com/hashicorp/golang-lru/simplelru: no Go files in \n"

@jterry75
Copy link
Copy Markdown
Contributor Author

@estesp - go.opencensus.io depends on lru as you suggest but when I run the vndr tool it doesnt suggest this is required. When we do this in hcsshim and use modules it is included as indirect. Should I just add it to the vendor.conf?

@crosbymichael
Copy link
Copy Markdown
Member

Ya, I guess just add it to vendor.conf and see if that fixes it

@estesp
Copy link
Copy Markdown
Member

estesp commented Aug 19, 2019

Looks like vendor.conf needs merged with current master updates

@jterry75
Copy link
Copy Markdown
Contributor Author

@estesp - Will update today

1. Revendors github.com/Microsoft/hcsshim to the latest known good commit.
This includes numerous bug fixes and improvements.

2. Vendors indirect dependency on go.opencensus.io since hcsshim now uses trace
correlation.

Signed-off-by: Justin Terry (VM) <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 20, 2019

Build succeeded.

@jterry75
Copy link
Copy Markdown
Contributor Author

Wahoo it worked!

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit 4924bcb into containerd:master Aug 21, 2019
@jterry75 jterry75 deleted the revenor_hcsshim branch October 23, 2019 18:44
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.

5 participants