Bump Ruby version to 3.1.2

phusion · Jun 1, 2022 · 75afdff · 75afdff
1 parent 1026223
commit 75afdff
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 103 deletions.
diff --git a/BUNDLER_VERSION.txt b/BUNDLER_VERSION.txt
@@ -1 +1 @@
-1.17.3
+2.3.14
diff --git a/RUBY_VERSIONS.txt b/RUBY_VERSIONS.txt
@@ -1 +1 @@
-2.4.10
+3.1.2
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-20210206
+20220601
diff --git a/linux/Rakefile b/linux/Rakefile
@@ -2,7 +2,7 @@ IMAGE_VERSION = "1.0"
 VERSION       = File.read("../VERSION.txt").strip
 RUBY_VERSIONS = File.read("../RUBY_VERSIONS.txt").strip.split(/\s+/)
 ARCHITECTURES = ["x86_64"]
-CONCURRENCY   = `./internal/cpucount`.to_i
+CONCURRENCY   = `./internal/cpucount`.to_i + 1
 
 task :default => :package
 

diff --git a/linux/internal/build-ruby b/linux/internal/build-ruby
@@ -233,7 +233,7 @@ if [[ "$DEBUG_SHELL" = before ]]; then
 	open_debug_shell
 fi
 if [[ -e /system_shared/gemfiles ]]; then
-	run /tmp/ruby/bin/gem install bundler -v $BUNDLER_VERSION --no-rdoc --no-ri
+	run /tmp/ruby/bin/gem install bundler -v $BUNDLER_VERSION --no-document
 	if [[ "$DEBUG_SHELL" = after ]]; then
 		install_gems || true
 	else

diff --git a/shared/gemfiles/20210107/Gemfile b/shared/gemfiles/20210107/Gemfile
diff --git a/shared/gemfiles/20210107/Gemfile.lock b/shared/gemfiles/20210107/Gemfile.lock
diff --git a/shared/gemfiles/20220601/Gemfile b/shared/gemfiles/20220601/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'ffi'
+gem 'json'
+gem 'yajl-ruby'
diff --git a/shared/gemfiles/20220601/Gemfile.lock b/shared/gemfiles/20220601/Gemfile.lock
@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.14.2)
+    json (2.5.1)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ffi
+  json
+  yajl-ruby
+
+BUNDLED WITH
+   2.3.14