From b903a6fa2833ea49712b65b22be5066e6a6021ea Mon Sep 17 00:00:00 2001 From: Jeff Erbrecht <89024676+jefferbrecht@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:07:57 -0500 Subject: [PATCH] Upgrade to Ruby 3.3.6 (#446) --- build/x86_64_amzn-2016.09/Dockerfile | 2 +- build/x86_64_centos6/Dockerfile | 2 +- build/x86_64_centos7/Dockerfile | 2 +- build/x86_64_centos8/Dockerfile | 2 +- build/x86_64_debian/Dockerfile | 2 +- build/x86_64_sles12/Dockerfile | 2 +- build/x86_64_sles15/Dockerfile | 2 +- config/projects/google-fluentd.rb | 2 +- config/software/ruby.rb | 3 ++- windows-installer/generate_sdl_agent_exe.ps1 | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/x86_64_amzn-2016.09/Dockerfile b/build/x86_64_amzn-2016.09/Dockerfile index 5610ab59..e0bb7ce3 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index 50327e4e..947f1f91 100644 --- 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.3.5 --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.6 --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 index 2d4e0bd7..7e700407 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index 69500616..f45812a1 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index dc461933..9ef46565 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index f04a5655..48eab3c6 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index 43c86643..fd971385 100644 --- 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.3.5 && gem install bundler --no-document && gem update --no-document" \ + && /bin/bash -l -c "rvm requirements && rvm install 3.3.6 && 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 index 97e6d161..faa597e5 100644 --- a/config/projects/google-fluentd.rb +++ b/config/projects/google-fluentd.rb @@ -13,7 +13,7 @@ # creates required build directories dependency "preparation" -override :ruby, :version => '3.3.5' +override :ruby, :version => '3.3.6' 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 index 98e3caa6..857b20f0 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -32,7 +32,7 @@ # config/software/td-agent-cleanup.rb # config/software/td-agent-files.rb # config/software/td-agent-ui.rb -default_version "3.3.5" +default_version "3.3.6" fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false @@ -51,6 +51,7 @@ dependency "jemalloc" # The SHA256 checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases. +version("3.3.6") { source sha256: "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d" } version("3.3.5") { source sha256: "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196" } version("3.3.4") { source sha256: "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34" } version("3.3.3") { source sha256: "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2" } diff --git a/windows-installer/generate_sdl_agent_exe.ps1 b/windows-installer/generate_sdl_agent_exe.ps1 index 5679b9e6..552db410 100644 --- 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.3.5-1/rubyinstaller-devkit-3.3.5-1-x64.exe" +$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.6-2/rubyinstaller-devkit-3.3.6-2-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"