# HG changeset patch # User Balasankar 'Balu' C <balasankar@gitlab.com> # Date 1718687328 -19800 # Tue Jun 18 10:38:48 2024 +0530 # Node ID b905a5cfdae497133e37f9c216f01ab59b77602d # Parent e93010aa4fd8dd39f568a751ad571040a6408c2b Use Ruby 3.2 in feature branch builds Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,9 +58,6 @@ CACHE_POLICY: 'pull-push' ISSUE_BOT_LABELS_EXTRA: "group::distribution" BUNDLER_VERSION: "2.5.9" - # NOTE: When `NEXT_RUBY_VERSION` is updated, flip - # `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises. - NEXT_RUBY_VERSION: "3.1.4" GET_GEO_TAG: "0.7.4" CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab' SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab' diff --git a/config/software/ruby.rb b/config/software/ruby.rb --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -28,7 +28,7 @@ # NOTE: When this value is updated, flip `USE_NEXT_RUBY_VERSION_IN_*` variable # to false to avoid surprises. -next_ruby_version = Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.1.5' +next_ruby_version = Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.2.4' # MRs targeting stable branches should use current Ruby version and ignore next # Ruby version. Also, we provide `USE_SPECIFIED_RUBY_VERSION` variable to force