From 0981fba75cc27b842950636eb469e940b4d3ebe3 Mon Sep 17 00:00:00 2001 From: Steffen Butzer Date: Mon, 30 Dec 2019 20:50:37 +0100 Subject: [PATCH 1/2] HCS: Remove not anymore needed CGO dependency With https://github.com/golang/go/commit/bb0fae603bd19e096e38c3321d95bf114f40dcff this also works without CGO (>=Go 1.11). --- internal/hcs/cgo.go | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 internal/hcs/cgo.go diff --git a/internal/hcs/cgo.go b/internal/hcs/cgo.go deleted file mode 100644 index 3669c34aa2..0000000000 --- a/internal/hcs/cgo.go +++ /dev/null @@ -1,7 +0,0 @@ -package hcs - -import "C" - -// This import is needed to make the library compile as CGO because HCSSHIM -// only works with CGO due to callbacks from HCS comming back from a C thread -// which is not supported without CGO. See https://github.com/golang/go/issues/10973 From 5613e3d980a4fc78e045c8c78c6aee4f4e3151bb Mon Sep 17 00:00:00 2001 From: Steffen Butzer Date: Tue, 7 Jan 2020 22:53:47 +0100 Subject: [PATCH 2/2] Remove now unused mingw from appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 661bc406f3..f1520c7385 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ clone_folder: c:\gopath\src\github.com\Microsoft\hcsshim environment: GOPATH: c:\gopath - PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%GOPATH%\bin;C:\gometalinter-2.0.12-windows-amd64;%PATH% + PATH: "%GOPATH%\\bin;C:\\gometalinter-2.0.12-windows-amd64;%PATH%" stack: go 1.13.4 @@ -38,4 +38,4 @@ artifacts: - path: 'containerd-shim-runhcs-v1.test.exe' - path: 'cri-containerd.test.exe' - path: 'functional.test.exe' - - path: 'runhcs.test.exe' \ No newline at end of file + - path: 'runhcs.test.exe'