Skip to content
Snippets Groups Projects
Commit 45ffb44826a8 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'use-ruby3-in-branch-builds-and-nightlies' into 'master'

Bundle Ruby 3 in feature branch builds and nightly builds

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6647



Merged-by: default avatarDJ Mountney <dj@gitlab.com>
Approved-by: default avatarDJ Mountney <dj@gitlab.com>
Co-authored-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!92Merging upstream 15.10.0+ce.0
......@@ -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'
......
......@@ -22,9 +22,7 @@
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'
......@@ -28,6 +26,8 @@
# 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?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment