Skip to content

Import Windows manifest into test build, rather than copying by script#4431

Merged
fuweid merged 1 commit intocontainerd:masterfrom
TBBle:import_manifest_for_test_binary
Jul 30, 2020
Merged

Import Windows manifest into test build, rather than copying by script#4431
fuweid merged 1 commit intocontainerd:masterfrom
TBBle:import_manifest_for_test_binary

Conversation

@TBBle
Copy link
Contributor

@TBBle TBBle commented Jul 28, 2020

This will ensure that we can always get the current Windows OS build version, without being put into Windows 8 compatibility mode, and without needing to manually copy files out of hcsshim when manually running the integration testsuite.

Depends on the latest version of vndr (LK4D4/vndr@f12b881) otherwise it will strip rsrc_amd64.syso from the vendor/ tree.

Idea from discussion at #4427 (comment), based on the same pattern in hcsshim itself.

This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.

Signed-off-by: Paul "TBBle" Hampson <[email protected]>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Jul 28, 2020

Build succeeded.

Copy link
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

Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit 4a96be9 into containerd:master Jul 30, 2020
@TBBle TBBle deleted the import_manifest_for_test_binary branch July 30, 2020 16:40
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.

3 participants