Merge pull request #172 from go-playground/general-maint

General maint

Author: Dean Karn

.github/workflows/workflow.yml

@@ -6,36 +6,37 @@ on:
 
 name: Test
 jobs:
-  lint:
-    name: Lint
+  golangci:
+    name: lint
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Run linter
-        uses: golangci/golangci-lint-action@v2
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.35.2
+          version: latest
 
   test:
     name: Test
     strategy:
       matrix:
-        go-version: [1.14.x, 1.15.x]
+        go-version: [1.17.x, 1.18.x, 1.20.x]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Restore cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-v1-go-${{ hashFiles('**/go.sum') }}
@@ -46,7 +47,7 @@ jobs:
         run: go test -race -covermode=atomic -coverprofile="coverage.out" ./...
 
       - name: Upload coverage report to Coveralls
-        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.15.x'
+        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.18.x'
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: coverage.out

.golangci.yml

@@ -1,21 +1,10 @@
-GOPATH=$(shell go env GOPATH)
-
 all: lint test
 
-linters-install:
-	@echo "+ $@"
-	@$(GOPATH)/bin/golangci-lint --version >/dev/null 2>&1 || { \
-  		echo "Install golangci-lint..."; \
-		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin; \
-	}
-
 lint: linters-install
-	@echo "+ $@"
-	$(GOPATH)/bin/golangci-lint run ./...
+	golangci-lint run --timeout 5m
 
 test:
-	@echo "+ $@"
-	GO111MODULE=on go test -covermode=atomic -race ./...
+	go test -covermode=atomic -race ./...
 
 .PHONY: test lint linters-install
 .DEFAULT_GOAL := all