From 4da47ab6602f906331b4eed7fa859056a06e16a4 Mon Sep 17 00:00:00 2001
From: kisunji <ckim@hashicorp.com>
Date: Wed, 13 Oct 2021 10:37:17 -0400
Subject: [PATCH 1/4] Add retract directive

---
 go.mod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index 09803b688..4d62c5fd6 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/hashicorp/raft
 
 go 1.12
 
+retract v1.1.3 // Deleted original tag; module checksum may not be accurate.
+
 require (
 	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878
 	github.com/hashicorp/go-hclog v0.9.1

From 5a945b496b84a8e11b0876d11ec5854364e25587 Mon Sep 17 00:00:00 2001
From: kisunji <ckim@hashicorp.com>
Date: Wed, 13 Oct 2021 12:32:49 -0400
Subject: [PATCH 2/4] Update go version references to 1.16+

---
 .circleci/config.yml | 11 ++++++++---
 README.md            |  2 +-
 go.mod               |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6bb94cf54..4f9d056bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,9 +4,6 @@ workflows:
   ci:
     jobs:
       - lint
-      - go-test:
-          name: test go1.15
-          version: "1.15"
       - go-test:
           name: test go1.16
           version: "1.16"
@@ -15,6 +12,14 @@ workflows:
           version: "1.16"
           goarch: "386"
           args: "" # remove -race
+      - go-test:
+          name: test go1.17
+          version: "1.17"
+      - go-test:
+          name: test go1.17 32bit
+          version: "1.17"
+          goarch: "386"
+          args: "" # remove -race
 
 executors:
   golang:
diff --git a/README.md b/README.md
index 11239ecb4..97173ad57 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ fault tolerance as well.
 
 ## Building
 
-If you wish to build raft you'll need Go version 1.2+ installed.
+If you wish to build raft you'll need Go version 1.16+ installed.
 
 Please check your installation with:
 
diff --git a/go.mod b/go.mod
index 4d62c5fd6..e088fa2ec 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/raft
 
-go 1.12
+go 1.16
 
 retract v1.1.3 // Deleted original tag; module checksum may not be accurate.
 

From 78ac0910ecfdd5748ba8b7135849f10a3e9ff450 Mon Sep 17 00:00:00 2001
From: kisunji <ckim@hashicorp.com>
Date: Wed, 13 Oct 2021 14:02:44 -0400
Subject: [PATCH 3/4] Lint on 1.17

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f9d056bf..503d93459 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,7 +42,7 @@ jobs:
   lint:
     executor:
       name: golang
-      version: "1.16"
+      version: "1.17"
     steps:
       - checkout
       - run: go mod download

From a11b21113be13f15c1d629c9a4dc1a0ca76e05d3 Mon Sep 17 00:00:00 2001
From: kisunji <ckim@hashicorp.com>
Date: Wed, 13 Oct 2021 14:43:17 -0400
Subject: [PATCH 4/4] Add go:build directive

---
 testing_batch.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing_batch.go b/testing_batch.go
index afb228561..ed69894de 100644
--- a/testing_batch.go
+++ b/testing_batch.go
@@ -1,3 +1,4 @@
+//go:build batchtest
 // +build batchtest
 
 package raft