From 5e463be8bc4593fa429ec7db4812a7b156773ca0 Mon Sep 17 00:00:00 2001
From: Justintime50 <39606064+Justintime50@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:03:46 -0600
Subject: [PATCH] fix: go linting on v1.23

---
 .github/workflows/ci.yml | 35 ++++++++++++-----------------------
 Makefile                 |  2 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6789f8d..8fa11f64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,7 @@ jobs:
   shell:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Run sh-checker
         uses: luizm/action-sh-checker@master
         env:
@@ -20,8 +19,7 @@ jobs:
   csharp:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Install C# dependencies
         run: make install-csharp
       - name: Lint project
@@ -29,20 +27,17 @@ jobs:
   go:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
       # install must occur in the same step as the linter to run properly on CI
       - name: Lint project
-        run: |
-          make install-go lint-go
+        run: make install-go lint-go
   java:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Install Java dependencies
         run: make install-java
       - name: Lint project
@@ -50,8 +45,7 @@ jobs:
   node:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: make install-node
       - name: Lint project
@@ -61,8 +55,7 @@ jobs:
   php:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: make install-php
       - name: Lint project
@@ -70,8 +63,7 @@ jobs:
   python:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Install Python dependencies
         run: make install-python
       - name: Lint project
@@ -81,10 +73,8 @@ jobs:
   ruby:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2'
           rubygems: '3.0.0'
@@ -96,7 +86,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Check for current dirs in docs
         run: ./test/ensure-current-dirs-exist.sh
diff --git a/Makefile b/Makefile
index 8eadcb0a..c3813d54 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ install-csharp:
 ## install-go - Install and vendor Go dependencies
 install-go:
 	sh ./symlink_directory_files.sh style_guides/golang .
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_BIN) v1.59.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_BIN) v1.60.1
 	go mod vendor
 
 ## install-java - installs Java dependencies