Skip to content

Allow gems to set required_ruby_version = '>= 3.2.0' #146

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

Merged
merged 3 commits into from
Jan 19, 2025
Merged

Allow gems to set required_ruby_version = '>= 3.2.0' #146

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a90b739
Add Ruby 3.4.1 as a "host" rbenv ruby, and make it the default.
flavorjones Jan 16, 2025
0818a11
Dockerfile: whitespace formatting
flavorjones Jan 19, 2025
1d0351d
mri: build 3.x rubies with ruby 3.4.1
flavorjones Jan 19, 2025
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
61 changes: 31 additions & 30 deletions Dockerfile.mri.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,30 @@ ENV BASH_ENV=/etc/rubybashrc
##
USER rubyuser

ENV RBENV_RUBIES="2.5.9 3.1.6"
ENV RBENV_RUBIES="2.5.9 3.1.6 3.4.1"

# Install the bootstrap rubies
RUN bash -c " \
echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
for v in ${RBENV_RUBIES} ; do \
rbenv install \$v -- --disable-install-doc ; \
done && \
find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+w \
"
echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
for v in ${RBENV_RUBIES} ; do \
rbenv install \$v -- --disable-install-doc ; \
done && \
find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+w \
"

# Install rake-compiler and patch it to build and install static libraries for Linux rubies
COPY build/patches /home/rubyuser/patches
RUN bash -c " \
for v in ${RBENV_RUBIES} ; do \
rbenv shell \$v && \
gem install rake-compiler -v1.2.9 && \
cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
patch -p1 < \$patch ; \
done \
done \
"
for v in ${RBENV_RUBIES} ; do \
rbenv shell \$v && \
gem install rake-compiler -v1.2.9 && \
cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
patch -p1 < \$patch ; \
done \
done \
"

# Install rake-compiler's cross rubies in global dir instead of /root
RUN sudo mkdir -p /usr/local/rake-compiler && \
Expand All @@ -115,7 +115,7 @@ 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.1:3.3.5:3.2.6:3.1.6", "3.1.6"],
["3.4.1:3.3.5:3.2.6:3.1.6", "3.4.1"],
]
elsif platform =~ /x64-mingw32/
[
Expand All @@ -126,24 +126,25 @@ elsif platform =~ /x64-mingw32/
else
[
["2.6.10:2.5.9:2.4.10", "2.5.9"],
["3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8", "3.1.6"],
["2.7.8", "3.1.6"],
["3.4.1:3.3.5:3.2.6:3.1.6:3.0.7", "3.4.1"],
]
end

strip = '-s' if platform !~ /darwin/

xrubies_build_plan.each do |xrubies, bootstrap_ruby_version| %>
RUN bash -c " \
rbenv shell <%= bootstrap_ruby_version %> && \
export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform =~ /x64-mingw-ucrt/ %>' && \
export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \
export LDFLAGS='-pipe <%= strip %>' && \
<%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
<%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
export MAKE='make V=1' && \
rake-compiler cross-ruby VERSION=<%= xrubies %> HOST=<%= target %> && \
rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources \
"
rbenv shell <%= bootstrap_ruby_version %> && \
export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform =~ /x64-mingw-ucrt/ %>' && \
export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \
export LDFLAGS='-pipe <%= strip %>' && \
<%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
<%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
export MAKE='make V=1' && \
rake-compiler cross-ruby VERSION=<%= xrubies %> HOST=<%= target %> && \
rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources \
"
<% end %>
# "

Expand Down Expand Up @@ -223,7 +224,7 @@ 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.1.6"
RUN bash -c "rbenv global 3.4.1"

ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10

Expand Down
Loading