Skip to content

Commit 90a7da8

Browse files
authored
Merge pull request #3128 from jhowardmsft/jjh/ci
Windows: appveyor: Build shim binary from Microsoft/hcsshim repo
2 parents 68c44f8 + 8710940 commit 90a7da8

11 files changed

Lines changed: 181 additions & 97 deletions

File tree

.appveyor.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
GOPATH: C:\gopath
1313
CGO_ENABLED: 1
1414
matrix:
15-
- GO_VERSION: 1.11
15+
- GO_VERSION: 1.12.1
1616

1717
before_build:
1818
- choco install -y mingw --version 5.3.0
@@ -22,10 +22,29 @@ before_build:
2222
- 7z x go%GO_VERSION%.windows-amd64.zip -oC:\ >nul
2323
- go version
2424
- choco install codecov
25+
# Clone hcsshim at the vendored version
26+
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH;
27+
rm -rf /c/gopath/src/github.com/Microsoft/hcsshim;
28+
git clone -q https://github.com/Microsoft/hcsshim.git /c/gopath/src/github.com/Microsoft/hcsshim;
29+
export HCSSHIM_VERSION=`grep Microsoft/hcsshim vendor.conf | awk '{print $2}'`;
30+
echo Using Microsoft/hcsshim $HCSSHIM_VERSION;
31+
pushd /c/gopath/src/github.com/Microsoft/hcsshim;
32+
git checkout $HCSSHIM_VERSION;
33+
popd"
2534
# Print host version. TODO: Remove this when containerd has a way to get host version
2635
- ps: $psversiontable
2736

2837
build_script:
38+
# Build containerd-shim-runhcs-v1.exe and runhcs.exe from Microsoft/hcsshim
39+
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:$PATH;
40+
export GOBIN=/c/gopath/src/github.com/Microsoft/hcsshim/bin;
41+
mkdir $GOBIN;
42+
pushd /c/gopath/src/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1;
43+
go install;
44+
cd ../runhcs;
45+
go install;
46+
ls -al $GOBIN;
47+
popd"
2948
- bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/bin:$PATH;
3049
script/setup/install-dev-tools;
3150
mingw32-make.exe check"

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
3434
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
3535
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
3636
github.com/Microsoft/go-winio c599b533b43b1363d7d7c6cfda5ede70ed73ff13
37-
github.com/Microsoft/hcsshim v0.8.5
37+
github.com/Microsoft/hcsshim 8abdbb8205e4192c68b5f84c31197156f31be517
3838
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
3939
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
4040
github.com/containerd/ttrpc f02858b1457c5ca3aaec3a0803eb0d59f96e41d6

vendor/github.com/Microsoft/hcsshim/internal/hcs/log.go

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/internal/hcs/process.go

Lines changed: 53 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)