From 564806f8ffc0faf5c298cec16b19e2b3be8130a9 Mon Sep 17 00:00:00 2001
From: Roger Ng <rogerng@google.com>
Date: Fri, 6 Sep 2024 10:59:43 +0100
Subject: [PATCH] Bump Go and golangci-lint to latest version (#190)

Unblock https://github.com/transparency-dev/serverless-log/pull/189.
---
 .github/workflows/go_test.yml            | 2 +-
 .github/workflows/golangci-lint.yml      | 6 +++---
 experimental/gcp-log/gcs_uploader/go.mod | 2 +-
 experimental/gcp-log/go.mod              | 2 +-
 go.mod                                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/go_test.yml b/.github/workflows/go_test.yml
index 5dcb589..c6717db 100644
--- a/.github/workflows/go_test.yml
+++ b/.github/workflows/go_test.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.22.x, 1.23.x]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index f6ef73f..eee6ae9 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -11,12 +11,12 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.21"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+          go-version-file: go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.54.1
+          version: v1.60.3
diff --git a/experimental/gcp-log/gcs_uploader/go.mod b/experimental/gcp-log/gcs_uploader/go.mod
index c8fc1d5..aef4395 100644
--- a/experimental/gcp-log/gcs_uploader/go.mod
+++ b/experimental/gcp-log/gcs_uploader/go.mod
@@ -1,6 +1,6 @@
 module github.com/gcp_serverless_example_module
 
-go 1.21
+go 1.22.7
 
 require cloud.google.com/go/storage v1.33.0
 
diff --git a/experimental/gcp-log/go.mod b/experimental/gcp-log/go.mod
index bc6ec89..48fe368 100644
--- a/experimental/gcp-log/go.mod
+++ b/experimental/gcp-log/go.mod
@@ -1,6 +1,6 @@
 module github.com/gcp_serverless_module
 
-go 1.21
+go 1.22.7
 
 require (
 	cloud.google.com/go/kms v1.15.5
diff --git a/go.mod b/go.mod
index 504af88..45c513e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/transparency-dev/serverless-log
 
-go 1.21.13
+go 1.22.7
 
 require (
 	github.com/gdamore/tcell/v2 v2.7.4