# HG changeset patch # User Balasankar 'Balu' C <balasankar@gitlab.com> # Date 1677279618 0 # Fri Feb 24 23:00:18 2023 +0000 # Node ID 1da502a9aed8d9c0b9c916c54d55726d9823c086 # Parent cb8f13d9cd968b90c3fc122fc8473c30720be133 Bundle Ruby 3 in feature branch builds and nightly 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 @@ -61,6 +61,7 @@ QA_BRANCH: 'master' ISSUE_BOT_LABELS_EXTRA: "group::distribution" BUNDLER_VERSION: "2.3.22" + NEXT_RUBY_VERSION: "3.0.5" GET_GEO_TAG: "0.4.0" 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 @@ -22,12 +22,12 @@ skip_transitive_dependency_licensing true -if Gitlab::Util.get_env('RUBY3_BUILD') == 'true' - default_version '3.0.5' -else +if Gitlab::Util.get_env('RUBY2_BUILD') == 'true' || Build::Check.on_tag? || Build::Check.on_stable_branch? # Follow the Ruby upgrade guidelines when changing the ruby version # link: https://docs.gitlab.com/ee/development/ruby_upgrade.html default_version '2.7.7' +else + default_version Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.0.5' end fips_enabled = Build::Check.use_system_ssl?