From 6370bc6a795e331110ca1a15aba8bdd5170fe0c3 Mon Sep 17 00:00:00 2001
From: Roger Ng <rogerng@google.com>
Date: Wed, 21 Aug 2024 16:18:12 +0000
Subject: [PATCH 1/3] Bump go version to 1.22.6

---
 .github/workflows/go_test.yml       | 2 +-
 .github/workflows/golangci-lint.yml | 2 +-
 .github/workflows/govulncheck.yml   | 2 +-
 go.mod                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/go_test.yml b/.github/workflows/go_test.yml
index 216d0ac4..9d91cde2 100644
--- a/.github/workflows/go_test.yml
+++ b/.github/workflows/go_test.yml
@@ -9,7 +9,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.22.x, 1.23.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 0aa33cee..e7100587 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 70e3f638..18eda76e 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -19,5 +19,5 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@dd0578b371c987f96d1185abb54344b44352bd58 # v1.0.3
         with:
-          go-version-input: 1.22.5
+          go-version-input: go.mod
           go-package: ./...
diff --git a/go.mod b/go.mod
index b4edfa92..7a896926 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/transparency-dev/trillian-tessera
 
-go 1.22.5
+go 1.22.6
 
 require (
 	cloud.google.com/go/kms v1.18.4

From aee536dce1679265cac464d9f049e050f2b438ed Mon Sep 17 00:00:00 2001
From: Roger Ng <rogerng@google.com>
Date: Wed, 21 Aug 2024 16:22:30 +0000
Subject: [PATCH 2/3] Fix failed tests

---
 cmd/example-mysql/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/example-mysql/docker/Dockerfile b/cmd/example-mysql/docker/Dockerfile
index 0857cfe6..35f5cbe6 100644
--- a/cmd/example-mysql/docker/Dockerfile
+++ b/cmd/example-mysql/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.5-bookworm@sha256:af9b40f2b1851be993763b85288f8434af87b5678af04355b1e33ff530b5765f as build
+FROM golang:1.22.6-bookworm@sha256:f020456572fc292e9627b3fb435c6de5dfb8020fbcef1fd7b65dd092c0ac56bb as build
 
 WORKDIR /build
 

From 4c8bd2bfc380ba7168eee69f27c1655da7d9a322 Mon Sep 17 00:00:00 2001
From: Roger Ng <rogerng@google.com>
Date: Wed, 21 Aug 2024 16:36:12 +0000
Subject: [PATCH 3/3] Fix failed govulncheck test

---
 .github/workflows/govulncheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 18eda76e..531b9692 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -19,5 +19,5 @@ jobs:
       - id: govulncheck
         uses: golang/govulncheck-action@dd0578b371c987f96d1185abb54344b44352bd58 # v1.0.3
         with:
-          go-version-input: go.mod
+          go-version-file: go.mod
           go-package: ./...