From ba71a3d56b83b4bdaca106a3fd29133d78b45281 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 2 Jan 2024 10:43:46 -0800
Subject: [PATCH 1/2] Bump development Ruby version to 3.2.2

All our CI pipelines already pass for Ruby 3.2, so let's
bump to Ruby 3.2.2 to flush out any other issues that might arise.
---
 .ruby-version  | 2 +-
 .tool-versions | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 0aec50e6ede78c..be94e6f53db6b3 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.4
+3.2.2
diff --git a/.tool-versions b/.tool-versions
index e22b41894e2e81..7801c5f858fa80 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -3,7 +3,7 @@ minio 2022-07-15T03-44-22Z
 nodejs 18.17.0
 postgres 14.9 13.12
 redis 7.0.14
-ruby 3.1.4
+ruby 3.2.2
 rust 1.73.0
 yarn 1.22.19
 vale 2.29.6
-- 
GitLab


From 01986a148941a947addcaf557148224b5de3167c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 2 Jan 2024 12:38:52 -0800
Subject: [PATCH 2/2] Use GDK's .ruby-version as canonical settings in
 build-gdk-image

This follows the change made in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132816.

The `build-gdk-image` job attempts to install GitLab with a given GDK
version. If the Ruby version is updated in the `gitlab/` directory,
the GDK pre-flight checker will detect that the GDK Ruby version is
inconsistent.

To avoid build failures that result from this, use the GDK
`.ruby-versions` as the canonical file by copying it into the `gitlab`
directory since that's what's actually installed.

This will help avoid causing broken builds whenever `.tool-versions`
change.
---
 qa/gdk/Dockerfile.gdk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk
index b3443049875285..5df7e712be7260 100644
--- a/qa/gdk/Dockerfile.gdk
+++ b/qa/gdk/Dockerfile.gdk
@@ -98,6 +98,7 @@ RUN set -eux; \
     gdk config set gitaly.skip_setup true \
     && gdk config set workhorse.skip_setup true \
     && gdk config set gitlab_shell.skip_setup true \
+    && cp .ruby-version ./gitlab/ \
     && cp .tool-versions ./gitlab/ \
     && make redis/redis.conf all \
     && gdk kill
-- 
GitLab