Skip to content

Update to Ruby 4.0.0 final inside the build containers #182

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

Closed
flavorjones wants to merge 1 commit into from
Closed

Update to Ruby 4.0.0 final inside the build containers #182

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## next / unreleased

- Bump Ruby 4 cross-compilation support to 4.0.0 final. #182
- Bump Ruby 4 cross-compilation support to 4.0.0-preview3. Note that ruby@094418a6 bumped the ABI in between preview2 and preview3. #179
- Drop support for Ruby 2.7. #180
- Remove native Ruby 3.4.8 from the host environment. #178
Expand Down
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 @@ -39,7 +39,7 @@ ENV BASH_ENV=/etc/rubybashrc
##
USER rubyuser

ENV RBENV_RUBIES="3.1.7 4.0.0-preview3"
ENV RBENV_RUBIES="3.1.7 4.0.0"

# Install the bootstrap rubies
RUN bash -c " \
Expand Down Expand Up @@ -152,11 +152,11 @@ xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
[
# Rubyinstaller-3.1+ is platform x64-mingw-ucrt
["3.3.10:3.2.9:3.1.7", "3.1.7"],
["4.0.0-preview3:3.4.8", "4.0.0-preview3"],
["4.0.0:3.4.8", "4.0.0"],
]
elsif platform =~ /aarch64-mingw-ucrt/
[
["4.0.0-preview3:3.4.8", "4.0.0-preview3"],
["4.0.0:3.4.8", "4.0.0"],
]
elsif platform =~ /x64-mingw32/
[
Expand All @@ -167,12 +167,12 @@ elsif platform =~ /x86-mingw32/
[
# There's no Rubyinstaller-4.x for platform x86-mingw32
["3.3.10:3.2.9:3.1.7:3.0.7", "3.1.7"],
["3.4.8", "4.0.0-preview3"],
["3.4.8", "4.0.0"],
]
else
[
["3.3.10:3.2.9:3.1.7:3.0.7", "3.1.7"],
["4.0.0-preview3:3.4.8", "4.0.0-preview3"],
["4.0.0:3.4.8", "4.0.0"],
]
end

Expand Down Expand Up @@ -274,7 +274,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 4.0.0-preview3"
RUN bash -c "rbenv global 4.0.0"

ENV RUBY_CC_VERSION=4.0.0:3.4.8:3.3.10:3.2.9:3.1.7:3.0.7

Expand Down
Loading