Upgrade to Ruby 3.3.5

GoogleCloudPlatform · Sep 30, 2024 · b9ba9f0 · b9ba9f0
1 parent 24a6b1a
commit b9ba9f0
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 17 deletions.
diff --git a/build/x86_64_amzn-2016.09/Dockerfile b/build/x86_64_amzn-2016.09/Dockerfile
@@ -26,5 +26,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  && yum -y clean all
diff --git a/build/x86_64_centos6/Dockerfile b/build/x86_64_centos6/Dockerfile
@@ -48,5 +48,5 @@ RUN yum -y install \
  # RVM requires running in a login shell.
  # Force RVM to link in a newer openssl version.
  && /bin/bash -l -c 'sed -i "/openssl_version/s/1.0.1i/1.1.1t/" $rvm_path/config/db && sed -i "s/ no-krb5//" $rvm_path/scripts/functions/pkg && rvm pkg install openssl' \
- && /bin/bash -l -c 'rvm requirements && rvm install 3.1.2 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update --no-document' \
+ && /bin/bash -l -c 'rvm requirements && rvm install 3.3.5 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update --no-document' \
  && yum -y clean all
diff --git a/build/x86_64_centos7/Dockerfile b/build/x86_64_centos7/Dockerfile
@@ -29,5 +29,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  && yum -y clean all
diff --git a/build/x86_64_centos8/Dockerfile b/build/x86_64_centos8/Dockerfile
@@ -36,5 +36,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  && yum -y clean all
diff --git a/build/x86_64_debian/Dockerfile b/build/x86_64_debian/Dockerfile
@@ -27,5 +27,5 @@ RUN apt-get -y update \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  && apt-get -y clean
diff --git a/build/x86_64_sles12/Dockerfile b/build/x86_64_sles12/Dockerfile
@@ -30,7 +30,7 @@ RUN zypper modifyrepo -d 'OSS Update' \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  # Pretend we're on SLES 12.
  && /bin/sed -i -e 's/VERSION = 42.3/VERSION = 12/' /etc/SuSE-release \
  && /bin/sed -i -e 's/VERSION="42.3"/VERSION="12-SP3"/' -e 's/VERSION_ID="42.3"/VERSION_ID="12.3"/' /etc/os-release \

diff --git a/build/x86_64_sles15/Dockerfile b/build/x86_64_sles15/Dockerfile
@@ -25,7 +25,7 @@ RUN zypper -n refresh \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 3.1.2 && gem install bundler --no-document && gem update --no-document" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.3.5 && gem install bundler --no-document && gem update --no-document" \
  # Pretend we're on SLES 15.
  && /bin/sed -i -e 's/VERSION="15.1"/VERSION="15-SP1"/' /etc/os-release \
  && zypper -n clean
diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb
@@ -14,7 +14,7 @@
 # creates required build directories
 dependency "preparation"
 
-override :ruby, :version => '3.1.2'
+override :ruby, :version => '3.3.5'
 override :zlib, :version => '1.2.8'
 override :rubygems, :version => '3.0.0'
 override :postgresql, :version => '9.6.24'

diff --git a/config/software/ruby.rb b/config/software/ruby.rb
@@ -26,13 +26,13 @@
 # - the current status of 2.3.x is that it downloads but fails to compile.
 # - verify that all ffi libs are available for your version on all platforms.
 
-# Note: When updating Ruby minor version (i.e. 2.2 -> 2.3), gem_dir_version must be
-# updated to 2.X.0 in the following file paths:
+# Note: When updating Ruby minor version (i.e. 3.2 -> 3.3), gem_dir_version must be
+# updated to 3.X.0 in the following file paths:
 #   config/software/td.rb
 #   config/software/td-agent-cleanup.rb
 #   config/software/td-agent-files.rb
 #   config/software/td-agent-ui.rb
-default_version "3.1.2"
+default_version "3.3.5"
 
 fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false
 
@@ -51,15 +51,34 @@
 dependency "jemalloc"
 
 # The SHA256 checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases.
+version("3.3.5")      { source sha256: "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196" }
+version("3.3.4")      { source sha256: "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34" }
+version("3.3.3")      { source sha256: "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2" }
+version("3.3.2")      { source sha256: "3be1d100ebf2a0ce60c2cd8d22cd9db4d64b3e04a1943be2c4ff7b520f2bcb5b" }
+version("3.3.1")      { source sha256: "8dc2af2802cc700cd182d5430726388ccf885b3f0a14fcd6a0f21ff249c9aa99" }
+version("3.3.0")      { source sha256: "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d" }
+
+version("3.2.5")      { source sha256: "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" }
+version("3.2.4")      { source sha256: "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" }
+version("3.2.3")      { source sha256: "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" }
+version("3.2.2")      { source sha256: "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" }
+version("3.2.1")      { source sha256: "13d67901660ee3217dbd9dd56059346bd4212ce64a69c306ef52df64935f8dbd" }
+version("3.2.0")      { source sha256: "daaa78e1360b2783f98deeceb677ad900f3a36c0ffa6e2b6b19090be77abc272" }
+
+version("3.1.6")      { source sha256: "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22" }
+version("3.1.5")      { source sha256: "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5" }
+version("3.1.4")      { source sha256: "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" }
 version("3.1.3")      { source sha256: "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" }
 version("3.1.2")      { source sha256: "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" }
 version("3.1.1")      { source sha256: "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" }
+
 version("3.0.5")      { source sha256: "9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" }
 version("3.0.4")      { source sha256: "70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" }
 version("3.0.3")      { source sha256: "3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac" }
 version("3.0.2")      { source sha256: "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" }
 version("3.0.1")      { source sha256: "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" }
 
+version("2.7.8")      { source sha256: "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" }
 version("2.7.7")      { source sha256: "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" }
 version("2.7.6")      { source sha256: "e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" }
 

diff --git a/config/software/td-agent-cleanup.rb b/config/software/td-agent-cleanup.rb
@@ -6,7 +6,7 @@
 build do
   block do
     project_name = project.name
-    gem_dir_version = "3.1.0"
+    gem_dir_version = "3.3.0"
 
     # remove unnecessary files
     FileUtils.rm_f(Dir.glob("/opt/#{project_name}/embedded/lib/ruby/gems/#{gem_dir_version}/cache/*.gem"))

diff --git a/config/software/td-agent-files.rb b/config/software/td-agent-files.rb
@@ -14,7 +14,7 @@
     install_path = project.install_dir # for ERB
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
-    gem_dir_version = "3.1.0"
+    gem_dir_version = "3.3.0"
     use_systemd = ohai["os"] == "linux" && ohai["platform_family"] == "suse"
 
     template = ->(*parts) { File.join('templates', *parts) }

diff --git a/config/software/td-agent-ui.rb b/config/software/td-agent-ui.rb
@@ -14,7 +14,7 @@
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
     project_name_snake_upcase = project_name_snake.upcase
-    gem_dir_version = "3.1.0"
+    gem_dir_version = "3.3.0"
 
     template = ->(*parts) { File.join('templates', *parts) }
     generate_from_template = ->(dst, src, erb_binding, opts={}) {

diff --git a/config/software/td.rb b/config/software/td.rb
@@ -13,7 +13,7 @@
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
     project_name_snake_upcase = project_name_snake.upcase
-    gem_dir_version = "3.1.0"
+    gem_dir_version = "3.3.0"
 
     template = ->(*parts) { File.join('templates', *parts) }
     generate_from_template = ->(dst, src, erb_binding, opts={}) {

diff --git a/core_gems.rb b/core_gems.rb
@@ -9,5 +9,5 @@
 download "oj", "3.3.10"
 download "tzinfo", "1.2.10"
 download "tzinfo-data", "1.2016.5"
-fetch "google-protobuf", "3.22.1"
+fetch "google-protobuf", "3.25.5"
 fetch "grpc", "1.53.0"
diff --git a/windows-installer/generate_sdl_agent_exe.ps1 b/windows-installer/generate_sdl_agent_exe.ps1
@@ -68,7 +68,7 @@ $NSIS_LOCATE_ZIP = $BASE_INSTALLER_DIR + "\NSISlocate.zip"
 
 
 # Links for each installer.
-$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.2-1/rubyinstaller-devkit-3.1.2-1-x64.exe"
+$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.5-1/rubyinstaller-devkit-3.3.5-1-x64.exe"
 $NSIS_INSTALLER_LINK = "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.0/nsis-3.0-setup.exe"
 $NSIS_UNZU_INSTALLER_LINK = "https://nsis.sourceforge.io/mediawiki/images/5/5a/NSISunzU.zip"
 $NSIS_LOCATE_INSTALLER_LINK = "https://nsis.sourceforge.io/mediawiki/images/a/af/Locate.zip"