Skip to content

Commit

Permalink
Upgrade to Ruby 3.3.6 (#446)
Browse files Browse the repository at this point in the history
  • Loading branch information
jefferbrecht authored Dec 2, 2024
1 parent 816a2b4 commit b903a6f
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/x86_64_amzn-2016.09/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/x86_64_centos6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/x86_64_centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/x86_64_centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/x86_64_debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/x86_64_sles12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion build/x86_64_sles15/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/projects/google-fluentd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion config/software/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion windows-installer/generate_sdl_agent_exe.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b903a6f

Please sign in to comment.