Merged PR 5946761: update ADO to 2028de8

Related work items: #1302, #1325, #1331, #1338, #1340, #1346, #1348

.github/workflows/ci.yml

@@ -8,19 +8,65 @@ env:
   GOPROXY: off
 
 jobs:
+  protos:
+    runs-on: 'windows-2019'
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.15.0'
+      - uses: actions/checkout@v2
+        with:
+          path: 'go/src/github.com/Microsoft/hcsshim'
+      # Install protoc-gen-gogoctrd in D:\bin
+      - uses: actions/checkout@v2
+        with:
+          repository: containerd/containerd
+          ref: v1.6.2
+          path: 'containerd'
+      - name: Install protoc-gen-gogoctrd
+        shell: powershell
+        run: |
+          cd containerd
+          go build ./cmd/protoc-gen-gogoctrd
+          mkdir D:\bin
+          mv protoc-gen-gogoctrd.exe D:\bin
+      # Install protoc in D:\bin
+      - name: Install protoc
+        shell: powershell
+        run: |
+          Invoke-WebRequest -OutFile protoc.zip -Uri https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win32.zip
+          Expand-Archive -Path protoc.zip -DestinationPath .
+          mv include go/src/github.com/Microsoft/hcsshim/protobuf
+          mv bin\protoc.exe D:\bin
+      - name: Run Protobuild
+        shell: powershell
+        run: |
+          go install github.com/containerd/[email protected]
+          cd go\src\github.com\Microsoft\hcsshim
+
+          $Env:Path += ";D:\bin;" + $Env:GOPATH + "\bin"
+          protobuild $(go list ./... | grep -v /vendor/)
+
+          git diff --exit-code
+        env:
+          GOPATH: '${{ github.workspace }}\go'
+          GOFLAGS:
+          GOPROXY:
+
   lint:
     runs-on: 'windows-2019'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.17.0'
+          go-version: '1.17.8'
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
           version: v1.42.1 # Has fixes for stylecheck configuration https://github.com/golangci/golangci-lint/pull/2017/files
           args: -v
+          skip-go-installation: true
           only-new-issues: true
 
   verify-main-vendor:
@@ -156,4 +202,4 @@ jobs:
       - name: Build And Test
         run: |
           BASE=./base.tar.gz
-          make all test
+          make all test

.gitignore

@@ -34,4 +34,7 @@ rootfs-conv/*
 /build/
 
 deps/*
-out/*
+out/*
+
+go.work
+go.work.sum

Makefile

@@ -32,7 +32,7 @@ clean:
 	rm -rf bin deps rootfs out
 
 test:
-	cd $(SRCROOT) && go test -v ./internal/guest/...
+	cd $(SRCROOT) && $(GO) test -v ./internal/guest/...
 
 rootfs: out/rootfs.vhd
 

Protobuild.toml

@@ -1,4 +1,4 @@
-version = "unstable"
+version = "1"
 generator = "gogoctrd"
 plugins = ["grpc", "fieldpath"]
 
@@ -14,11 +14,6 @@ plugins = ["grpc", "fieldpath"]
   # target package.
   packages = ["github.com/gogo/protobuf"]
 
-  # Paths that will be added untouched to the end of the includes. We use
-  # `/usr/local/include` to pickup the common install location of protobuf.
-  # This is the default.
-  after = ["/usr/local/include"]
-
 # This section maps protobuf imports to Go packages. These will become
 # `-M` directives in the call to the go protobuf generator.
 [packages]

cmd/containerd-shim-runhcs-v1/clone.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/delete.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/events.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/events_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import "context"

cmd/containerd-shim-runhcs-v1/exec.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/exec_clone.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/exec_hcs.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/exec_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/exec_wcow_podsandbox.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/exec_wcow_podsandbox_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/main.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/pod.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/pod_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/serve.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/service.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (

cmd/containerd-shim-runhcs-v1/service_internal.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package main
 
 import (