diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0224639c65b708a043b2b3092e9533619e411466_LmdpdGxhYi1jaS55bWw=..4215106bad5922a77c6a6ffd0efc72ee2f0db6e4_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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' diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 0224639c65b708a043b2b3092e9533619e411466_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI=..4215106bad5922a77c6a6ffd0efc72ee2f0db6e4_Y29uZmlnL3NvZnR3YXJlL3J1YnkucmI= 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -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"