diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..a0717e4b3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.go text eol=lf
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4916ffb61..a37bf4b1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,13 +20,13 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-18.04, macos-10.15] # TODO: pass linters on 'windows-2019'
+        go-version: [1.15.2]
+        os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v1
+      - uses: actions/checkout@v2
         with:
-          go-version: '1.15.2'
+          path: src/github.com/containerd/containerd
 
       - name: Set env
         shell: bash
@@ -34,22 +34,10 @@ jobs:
           echo "::set-env name=GOPATH::${{ github.workspace }}"
           echo "::add-path::${{ github.workspace }}/bin"
 
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: golangci/golangci-lint-action@v2
         with:
-          path: src/github.com/containerd/containerd
-
-      - name: Install dev tools
-        env:
-          GO111MODULE: off
-        shell: bash
-        run: script/setup/install-dev-tools
-        working-directory: src/github.com/containerd/containerd
-
-      - name: Make check
-        shell: bash
-        run: make check
-        working-directory: src/github.com/containerd/containerd
+          version: v1.29
+          working-directory: src/github.com/containerd/containerd
 
   #
   # Project checks
diff --git a/remotes/docker/auth/fetch.go b/remotes/docker/auth/fetch.go
index 7a05e3933..f65c6be38 100644
--- a/remotes/docker/auth/fetch.go
+++ b/remotes/docker/auth/fetch.go
@@ -106,10 +106,8 @@ func FetchTokenWithOAuth(ctx context.Context, client *http.Client, headers http.
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = append(req.Header[k], v...)
-		}
+	for k, v := range headers {
+		req.Header[k] = append(req.Header[k], v...)
 	}
 
 	resp, err := ctxhttp.Do(ctx, client, req)
@@ -152,10 +150,8 @@ func FetchToken(ctx context.Context, client *http.Client, headers http.Header, t
 		return nil, err
 	}
 
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = append(req.Header[k], v...)
-		}
+	for k, v := range headers {
+		req.Header[k] = append(req.Header[k], v...)
 	}
 
 	reqParams := req.URL.Query()
diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go
index de126e6d8..5708e6f5b 100644
--- a/runtime/v2/example/example.go
+++ b/runtime/v2/example/example.go
@@ -31,8 +31,6 @@ import (
 var (
 	// check to make sure the *service implements the GRPC API
 	_ = (taskAPI.TaskService)(&service{})
-	// common response type
-	empty = &ptypes.Empty{}
 )
 
 // New returns a new shim service
@@ -121,7 +119,7 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (*task
 // Shutdown is called after the underlying resources of the shim are cleaned up and the service can be stopped
 func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*ptypes.Empty, error) {
 	os.Exit(0)
-	return empty, nil
+	return &ptypes.Empty{}, nil
 }
 
 // Stats returns container level system stats for a container and its processes