Skip to content
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

Add Ruby 3.4 cross-compilation support. #131

Merged
merged 1 commit into from
Dec 13, 2024
+20 −7
Merged

Add Ruby 3.4 cross-compilation support. #131

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
14 changes: 10 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -169,7 +169,7 @@ jobs:
fail-fast: false
matrix:
platform: [x86_64-linux, x86_64-linux-gnu]
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
include:
# declare rubygems for each ruby version
- { ruby: "2.7", rubygems: "3.4.22" }
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
- x86_64-linux
- x86_64-linux-gnu
- x86_64-linux-musl
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
include:
# declare rubygems for each ruby version
- { ruby: "2.7", rubygems: "3.4.22" }
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-13, macos-14]
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
exclude:
# setup-ruby does not provide ruby 2.4 or 2.5 on arm64-darwin as of 2024-05-01
- os: macos-14
Expand Down Expand Up @@ -301,6 +301,9 @@ jobs:
- os: windows-latest
ruby: "3.3"
platform: x64-mingw-ucrt
- os: windows-latest
ruby: "head" # "3.4.0-rc1" not available yet on windows
platform: x64-mingw-ucrt
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -353,6 +356,9 @@ jobs:
- os: windows-latest
ruby: "3.3"
platform: x64-mingw-ucrt
- os: windows-latest
ruby: "head" # "3.4.0-rc1" not available yet on windows
platform: x64-mingw-ucrt
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.mri.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
[
# Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
["3.3.5:3.2.0:3.1.0", "3.1.3"],
["3.4.0-rc1:3.3.5:3.2.0:3.1.0", "3.1.3"],
]
elsif platform =~ /x64-mingw32/
[
Expand All @@ -121,7 +121,7 @@ elsif platform =~ /x64-mingw32/
else
[
["2.6.0:2.5.0:2.4.0", "2.5.9"],
["3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
["3.4.0-rc1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
]
end

Expand Down Expand Up @@ -217,6 +217,6 @@ COPY build/sudoers /etc/sudoers.d/rake-compiler-dock

RUN bash -c "rbenv global 3.1.3"

ENV RUBY_CC_VERSION=3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
ENV RUBY_CC_VERSION=3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0

CMD bash
7 changes: 7 additions & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# `rake-compiler/rake-compiler-dock` Changelog

## next / unreleased

### Ruby 3.4 support

- Add Ruby 3.4.0-rc1 cross-compilation support.


## v1.6.0 / 2024-12-13

### Notable changes
Expand Down
Loading