From 56fbba04f2647621ce6be4a67e7fed63320d7eb7 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <ryanjohnson95@gmail.com>
Date: Thu, 4 Jan 2024 16:45:02 -0600
Subject: [PATCH] Fix gha

---
 .github/workflows/go.yml | 18 ++++++------------
 Makefile                 |  6 ------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 36b8ed0..6d35c66 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -34,17 +34,11 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
         with:
-          go-version: ^1.21
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Get dependencies
-        run: make setup
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.55
 
-      - name: Lint
-        run: make lint
+          args: --skip-files .*_test.go --enable wsl --enable misspell --timeout 180s
diff --git a/Makefile b/Makefile
index 99602e8..84502d1 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,6 @@ setup:
 		curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh; \
 		dep ensure; \
 	fi; \
-	if ! command -v golangci-lint > /dev/null 2>&1; then \
-		echo "Installing golangci-lint..."; \
-		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin latest; \
-	else \
-		echo "golangci-lint is already installed."; \
-	fi
 
 lint:
 	golangci-lint run --skip-files .*_test.go --enable wsl --enable misspell --timeout 180s