Skip to content

Commit aa56cfc

Browse files
committedJul 28, 2020
Import Windows manifest into test build, rather than copying by script
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]>
1 parent eb6354a commit aa56cfc

File tree

5 files changed

+41
-4
lines changed

5 files changed

+41
-4
lines changed
 

‎.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ jobs:
299299
- name: Integration 1
300300
shell: bash
301301
run: |
302-
cp src/github.com/Microsoft/hcsshim/test/functional/manifest/rsrc_amd64.syso src/github.com/containerd/containerd/
303302
cd src/github.com/containerd/containerd
304303
export CGO_ENABLED=1
305304
mingw32-make.exe integration

‎client_windows_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323

2424
"github.com/Microsoft/hcsshim/osversion"
25+
_ "github.com/Microsoft/hcsshim/test/functional/manifest" // For rsrc_amd64.syso
2526
)
2627

2728
const (
@@ -53,9 +54,6 @@ func init() {
5354
testImage = "mcr.microsoft.com/windows/nanoserver:1909"
5455
case 19041: // this isn't in osversion yet, but the image should be available
5556
testImage = "mcr.microsoft.com/windows/nanoserver:2004"
56-
case 9200: // Missing manifest, so it's running in compatibility mode
57-
fmt.Println("You need to copy Microsoft/hcsshim/test/functional/manifest/rsrc_amd64.syso into the containerd checkout")
58-
panic("Running in Windows 8/Windows Server 2012 compatibility mode, failed to detect Windows build version")
5957
default:
6058
fmt.Println("No test image defined for Windows build version:", b)
6159
panic("No windows test image found for this Windows build")

‎vendor/github.com/Microsoft/hcsshim/test/functional/manifest/manifest.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/test/go.mod

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.