Skip to content
Snippets Groups Projects
Commit e79fd99a authored by Stan Hu's avatar Stan Hu
Browse files

Upgrade Ruby to v2.7.2

Update RubyGems to v3.1.4

Part of https://gitlab.com/groups/gitlab-org/-/epics/2380
parent a3d27fc2
No related branches found
No related tags found
No related merge requests found
---
title: Upgrade Ruby to v2.7.2
merge_request: 4632
author:
type: other
diff --git a/io.c b/io.c
index 3f7dbde50d..b882cc6685 100644
index 868756ffc5..2e4166d664 100644
--- a/io.c
+++ b/io.c
@@ -10834,7 +10834,7 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
@@ -10887,7 +10887,7 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
return 0;
}
-#if defined __linux__ && defined __NR_copy_file_range
-#if defined HAVE_COPY_FILE_RANGE || (defined __linux__ && defined __NR_copy_file_range)
+#if 0
# define USE_COPY_FILE_RANGE
#endif
Loading
Loading
Loading
Loading
@@ -19,5 +19,5 @@ build do
" --bindir '#{install_dir}/embedded/bin'" \
' --no-document', env: env
patch source: 'disable_license_enforce.patch',
target: "#{install_dir}/embedded/lib/ruby/gems/2.6.0/gems/chef-bin-#{version}/bin/chef-client"
target: "#{install_dir}/embedded/lib/ruby/gems/2.7.0/gems/chef-bin-#{version}/bin/chef-client"
end
Loading
Loading
@@ -28,7 +28,7 @@ skip_transitive_dependency_licensing true
# - verify that all ffi libs are available for your version on all platforms.
# - when upgrading please check the ABI version and update the exclusion until
# https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3414 is addressed
default_version '2.6.6'
default_version '2.7.2'
 
fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false
 
Loading
Loading
@@ -44,7 +44,7 @@ dependency 'libyaml'
# and that's the only one we will ever use.
dependency 'libiconv'
 
version('2.6.6') { source sha256: '364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291' }
version('2.7.2') { source sha256: '6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4' }
 
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
 
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@
#
 
name 'rubygems'
default_version '2.7.10'
default_version '3.1.4'
 
license 'MIT'
license_file 'LICENSE.txt'
Loading
Loading
@@ -39,7 +39,8 @@ if version && !source
'2.4.4' => '440a89ad6a3b1b7a69b034233cc4658e',
'2.4.5' => '5918319a439c33ac75fbbad7fd60749d',
'2.4.8' => 'dc77b51449dffe5b31776bff826bf559',
'2.7.9' => '173272ed55405caf7f858b6981fff526'
'2.7.9' => '173272ed55405caf7f858b6981fff526',
'3.1.4' => 'd117187a8f016cbe8f52011ae02e858b'
}
known_tarballs.each do |version, md5|
version version do
Loading
Loading
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