From c1f559b33c83bb2be6dbb24b1723b2717deede72 Mon Sep 17 00:00:00 2001
From: Allen Ray <alray@redhat.com>
Date: Wed, 7 Feb 2024 11:05:56 -0500
Subject: [PATCH] Migrate to go1.22

Signed-off-by: Allen Ray <alray@redhat.com>
---
 .github/workflows/govuln.yaml          | 2 +-
 .github/workflows/static-analysis.yaml | 2 +-
 .github/workflows/test_amd64.yaml      | 2 +-
 .github/workflows/test_template.yaml   | 2 +-
 go.mod                                 | 4 +++-
 tools/mod/go.mod                       | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/govuln.yaml b/.github/workflows/govuln.yaml
index 2a0d9df4..7487d5e8 100644
--- a/.github/workflows/govuln.yaml
+++ b/.github/workflows/govuln.yaml
@@ -7,6 +7,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.6"
+          go-version: "1.22.1"
       - run: date
       - run: go install golang.org/x/vuln/cmd/govulncheck@latest && govulncheck ./...
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index b5fdb65a..22afe47e 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.6"
+          go-version: "1.22.1"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
diff --git a/.github/workflows/test_amd64.yaml b/.github/workflows/test_amd64.yaml
index c6476a68..3062764c 100644
--- a/.github/workflows/test_amd64.yaml
+++ b/.github/workflows/test_amd64.yaml
@@ -22,5 +22,5 @@ jobs:
         run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.6"
+          go-version: "1.22.1"
       - run: make test
\ No newline at end of file
diff --git a/.github/workflows/test_template.yaml b/.github/workflows/test_template.yaml
index 9bce0b5d..042a03d8 100644
--- a/.github/workflows/test_template.yaml
+++ b/.github/workflows/test_template.yaml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.6"
+          go-version: "1.22.1"
       - env: 
           TARGET: ${{ matrix.target }}
         run: |
diff --git a/go.mod b/go.mod
index f8e20983..9b2b1f4f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module go.etcd.io/raft/v3
 
-go 1.21
+go 1.22
+
+toolchain go1.22.1
 
 require (
 	github.com/cockroachdb/datadriven v1.0.2
diff --git a/tools/mod/go.mod b/tools/mod/go.mod
index c5e668c9..f56ceee8 100644
--- a/tools/mod/go.mod
+++ b/tools/mod/go.mod
@@ -1,6 +1,8 @@
 module go.etcd.io/raft/tools/v3
 
-go 1.21
+go 1.22
+
+toolchain go1.22.1
 
 require (
 	github.com/alexkohler/nakedret v1.0.0