Skip to content
Snippets Groups Projects
Commit 47a9a16dacc8 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'mk-ruby-patches' into 'master'

Update Rubies to 2023-30 patch levels

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



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarJason Plum <jplum@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarMatthias Kaeppler <mkaeppler@gitlab.com>
No related branches found
No related tags found
3 merge requests!102heptapod#1237: making 0.38 the new oldstable,!96Merged heptapod branch for upstream 15.11 in heptapod-stable,!93Merged upstream 15.11.0+rc42+ce.0
......@@ -62,7 +62,7 @@
BUNDLER_VERSION: "2.3.22"
# NOTE: When `NEXT_RUBY_VERSION` is updated, flip
# `USE_NEXT_RUBY_VERSION_IN_*` variables to false to avoid surprises.
NEXT_RUBY_VERSION: "3.0.5"
NEXT_RUBY_VERSION: "3.0.6"
GET_GEO_TAG: "0.4.0"
CANONICAL_PROJECT_PATH: 'gitlab-org/omnibus-gitlab'
SECURITY_PROJECT_PATH: 'gitlab-org/security/omnibus-gitlab'
......
......@@ -24,7 +24,7 @@
# Follow the Ruby upgrade guide when changing the ruby version
# link: https://docs.gitlab.com/ee/development/ruby_upgrade.html
current_ruby_version = '3.0.5'
current_ruby_version = '3.0.6'
# NOTE: When this value is updated, flip `USE_NEXT_RUBY_VERSION_IN_*` variable
# to false to avoid surprises.
......@@ -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.0.5'
next_ruby_version = Gitlab::Util.get_env('NEXT_RUBY_VERSION') || '3.0.6'
# MRs targeting stable branches should use current Ruby version and ignore next
# Ruby version. Also, we provide `USE_OLD_RUBY_VERSION` variable to force usage
......@@ -66,8 +66,8 @@
dependency 'libiconv'
dependency 'jemalloc'
version('2.7.7') { source sha256: 'e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90' }
version('3.0.5') { source sha256: '9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776' }
version('2.7.8') { source sha256: 'c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0' }
version('3.0.6') { source sha256: '6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e' }
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
......
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