From 2f5fc6ad1eeda6a9475a97a85fd1db3a1dfb0149 Mon Sep 17 00:00:00 2001
From: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Date: Tue, 28 May 2024 23:40:01 +0000
Subject: [PATCH 1/5] Update golang to 1.22

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

diff --git a/go.mod b/go.mod
index abd4086833..713dc1e35c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module gitlab.com/gitlab-org/gitaly/v16
 
-go 1.21
+go 1.22
 
 // It is a temporary solution, please see https://gitlab.com/gitlab-org/gitaly/-/issues/4423 for details.
 replace github.com/go-enry/go-license-detector/v4 => github.com/gl-gitaly/go-license-detector/v4 v4.0.0-20230524080836-4cc9a3796917
-- 
GitLab


From 82f3b2f174689035877211dff0d5646f190fce9d Mon Sep 17 00:00:00 2001
From: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Date: Wed, 29 May 2024 15:41:38 +0000
Subject: [PATCH 2/5] Drop support for go 1.21

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71dc8bceb6..3d6442c951 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ default:
   git_minimum: "v2.42.0"
   gitlab_dangerfiles: "4.5.1"
   go_default: "1.22"
-  go_supported: [ "1.21", "1.22" ]
+  go_supported: [ "1.22" ]
   macos: "macos-12-xcode-14"
   pgbouncer: "1.17.0"
   postgres_default: "12-alpine"
-- 
GitLab


From ed409c1758afbeec81d23de9c68ca0d52a8cae12 Mon Sep 17 00:00:00 2001
From: John Mason <jmason@gitlab.com>
Date: Wed, 29 May 2024 21:41:07 -0400
Subject: [PATCH 3/5] Update go version

---
 .tool-versions | 2 +-
 README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 5175da87d8..eb6537fcc9 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 # Versions of Gitaly dependencies managed by asdf.
-golang 1.22.1 1.21.7
+golang 1.22.1
 ruby 3.2.3
diff --git a/README.md b/README.md
index 81a7431c24..4ef37fd3a1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ We are building features according to our [roadmap][roadmap].
 
 Most users won't install Gitaly on its own. It is already included in [your GitLab installation](https://about.gitlab.com/install/).
 
-Gitaly requires Go 1.21. Run `make` to compile the executables
+Gitaly requires Go 1.22. Run `make` to compile the executables
 required by Gitaly.
 
 Gitaly uses `git`. Versions `2.42.0` and newer are supported.
-- 
GitLab


From a4128a3785b17ae7ae920b6c98c325dc0ab2b291 Mon Sep 17 00:00:00 2001
From: John Mason <jmason@gitlab.com>
Date: Wed, 29 May 2024 21:42:08 -0400
Subject: [PATCH 4/5] Use go 1.22.3

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index eb6537fcc9..1ad9c31952 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 # Versions of Gitaly dependencies managed by asdf.
-golang 1.22.1
+golang 1.22.3
 ruby 3.2.3
-- 
GitLab


From 424d9227e10cecd79262627126c8196f8b85a203 Mon Sep 17 00:00:00 2001
From: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Date: Mon, 3 Jun 2024 19:55:22 +0000
Subject: [PATCH 5/5] Keep support for go 1.21

---
 .gitlab-ci.yml | 2 +-
 .tool-versions | 2 +-
 README.md      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d6442c951..71dc8bceb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ default:
   git_minimum: "v2.42.0"
   gitlab_dangerfiles: "4.5.1"
   go_default: "1.22"
-  go_supported: [ "1.22" ]
+  go_supported: [ "1.21", "1.22" ]
   macos: "macos-12-xcode-14"
   pgbouncer: "1.17.0"
   postgres_default: "12-alpine"
diff --git a/.tool-versions b/.tool-versions
index 1ad9c31952..d18c5f3c26 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 # Versions of Gitaly dependencies managed by asdf.
-golang 1.22.3
+golang 1.22.3 1.21.7
 ruby 3.2.3
diff --git a/README.md b/README.md
index 4ef37fd3a1..81a7431c24 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ We are building features according to our [roadmap][roadmap].
 
 Most users won't install Gitaly on its own. It is already included in [your GitLab installation](https://about.gitlab.com/install/).
 
-Gitaly requires Go 1.22. Run `make` to compile the executables
+Gitaly requires Go 1.21. Run `make` to compile the executables
 required by Gitaly.
 
 Gitaly uses `git`. Versions `2.42.0` and newer are supported.
-- 
GitLab