Skip to content

Bump Ruby versions in MRI containers #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump Ruby versions in MRI containers #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile.mri.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ENV BASH_ENV=/etc/rubybashrc
##
USER rubyuser

ENV RBENV_RUBIES="3.1.7 3.4.5"
ENV RBENV_RUBIES="3.1.7 3.4.7"

# Install the bootstrap rubies
RUN bash -c " \
Expand Down Expand Up @@ -148,11 +148,11 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
[
# Rubyinstaller-3.1+ is platform x64-mingw-ucrt
["3.4.5:3.3.9:3.2.9:3.1.7", "3.4.5"],
["3.4.7:3.3.10:3.2.9:3.1.7", "3.4.7"],
]
elsif platform =~ /aarch64-mingw-ucrt/
[
["3.4.5", "3.1.7"],
["3.4.7", "3.1.7"],
]
elsif platform =~ /x64-mingw32/
[
Expand All @@ -162,7 +162,7 @@ elsif platform =~ /x64-mingw32/
else
[
["2.7.8", "3.1.7"],
["3.4.5:3.3.9:3.2.9:3.1.7:3.0.7", "3.4.5"],
["3.4.7:3.3.10:3.2.9:3.1.7:3.0.7", "3.4.7"],
]
end

Expand Down Expand Up @@ -264,8 +264,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc
# Install sudoers configuration
COPY build/sudoers /etc/sudoers.d/rake-compiler-dock

RUN bash -c "rbenv global 3.4.5"
RUN bash -c "rbenv global 3.4.7"

ENV RUBY_CC_VERSION=3.4.5:3.3.9:3.2.9:3.1.7:3.0.7:2.7.8
ENV RUBY_CC_VERSION=3.4.7:3.3.10:3.2.9:3.1.7:3.0.7:2.7.8

CMD bash
14 changes: 7 additions & 7 deletions lib/rake_compiler_dock.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ def exec(*args, &block)
#
# RakeCompilerDock.cross_rubies
# # => {
# # "3.4" => "3.4.5",
# # "3.3" => "3.3.9",
# # "3.4" => "3.4.7",
# # "3.3" => "3.3.10",
# # "3.2" => "3.2.9",
# # "3.1" => "3.1.7",
# # "3.0" => "3.0.7",
Expand All @@ -92,8 +92,8 @@ def exec(*args, &block)
#
def cross_rubies
{
"3.4" => "3.4.5",
"3.3" => "3.3.9",
"3.4" => "3.4.7",
"3.3" => "3.3.10",
"3.2" => "3.2.9",
"3.1" => "3.1.7",
"3.0" => "3.0.7",
Expand All @@ -112,13 +112,13 @@ def cross_rubies
#
# For example:
# RakeCompilerDock.ruby_cc_version("2.7", "3.4")
# # => "3.4.5:2.7.8"
# # => "3.4.7:2.7.8"
#
# RakeCompilerDock.ruby_cc_version("~> 3.2")
# # => "3.4.5:3.3.9:3.2.9"
# # => "3.4.7:3.3.10:3.2.9"
#
# RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2"))
# # => "3.4.5:3.3.9:3.2.9"
# # => "3.4.7:3.3.10:3.2.9"
#
def ruby_cc_version(*requirements)
cross = cross_rubies
Expand Down