fix CI linting

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ~1.17
+        go-version: ~1.16
       id: go
 
     - name: Check out code into the Go module directory
@@ -36,7 +36,7 @@ jobs:
       run: go mod download
 
     - name: check
-      run: make fix
+      run: make lint fix
 
     - name: Test
       run: make test
@@ -48,19 +48,6 @@ jobs:
       with:
         path-to-profile: cover.out
 
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Lint
-      uses: golangci/golangci-lint-action@v2
-      with:
-        version: v1.35.2
-
   go-apidiff:
     name: go-apidiff
     if: github.event_name == 'pull_request'

Makefile

@@ -69,7 +69,7 @@ fix:
 # Run various checks against code
 .PHONY: lint
 lint:
-	fetch golangci-lint 1.43.0 && golangci-lint run
+	fetch golangci-lint 1.45.2 && golangci-lint run
 
 .PHONY: release
 release: GORELEASER_ARGS ?= --snapshot --rm-dist --skip-sign