Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
ruby: ["4.0.0-preview3", "3.4", "3.3", "3.2", "3.1", "3.0"]
Copy link
Copy Markdown
Collaborator

@flavorjones flavorjones Dec 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not going to work until dockerhub images are updated, and setup-ruby is updated.

I would advise just updating the ruby version in the container as a first step.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opened an alternative that just updates the version in the container image: #182

ruby: ["4.0.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -192,7 +192,7 @@ jobs:
fail-fast: false
matrix:
platform: [x86_64-linux, x86_64-linux-gnu]
ruby: ["4.0.0-preview3", "3.4", "3.3", "3.2", "3.1", "3.0"]
ruby: ["4.0.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
include:
# declare rubygems for each ruby version
- { ruby: "3.0", rubygems: "3.5.23" }
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
- x86_64-linux
- x86_64-linux-gnu
- x86_64-linux-musl
ruby: ["4.0.0-preview3", "3.4", "3.3", "3.2", "3.1", "3.0"]
ruby: ["4.0.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
include:
# declare rubygems for each ruby version
- { ruby: "3.0", rubygems: "3.5.23" }
Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-15-intel, macos-15]
ruby: ["4.0.0-preview3", "3.4", "3.3", "3.2", "3.1", "3.0"]
ruby: ["4.0.0", "3.4", "3.3", "3.2", "3.1", "3.0"]
include:
- os: macos-15-intel
platform: x86_64-darwin
Expand All @@ -306,7 +306,7 @@ jobs:
ruby: "3.4"
platform: x64-mingw-ucrt
- os: windows-latest
ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
ruby: "head" # setup-ruby does not have 4.0 yet on windows
platform: x64-mingw-ucrt
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
ruby: "3.4"
platform: x64-mingw-ucrt
- os: windows-latest
ruby: "head" # setup-ruby does not have 4.0 previews yet on windows
ruby: "head" # setup-ruby does not have 4.0 yet on windows
platform: x64-mingw-ucrt
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## next / unreleased

- Bump Ruby 4 cross-compilation support to 4.0.0-preview3. Note that ruby@094418a6 bumped the ABI in between preview2 and preview3.
- Bump Ruby 4 cross-compilation support to 4.0.0. Note that ruby@094418a6 bumped the ABI in between preview2 and preview3.


## 1.11.0.rc1 / 2025-12-19
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile.mri.erb
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