Skip to content

Commit f00a02d

Browse files
committed
Add Ruby 3.4 cross-compilation support.
1 parent 67ecbc6 commit f00a02d

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
fail-fast: false
145145
matrix:
146146
os: [ubuntu-latest]
147-
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
147+
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
148148
runs-on: ${{ matrix.os }}
149149
steps:
150150
- uses: actions/checkout@v4
@@ -169,7 +169,7 @@ jobs:
169169
fail-fast: false
170170
matrix:
171171
platform: [x86_64-linux, x86_64-linux-gnu]
172-
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
172+
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
173173
include:
174174
# declare rubygems for each ruby version
175175
- { ruby: "2.7", rubygems: "3.4.22" }
@@ -213,7 +213,7 @@ jobs:
213213
- x86_64-linux
214214
- x86_64-linux-gnu
215215
- x86_64-linux-musl
216-
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
216+
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
217217
include:
218218
# declare rubygems for each ruby version
219219
- { ruby: "2.7", rubygems: "3.4.22" }
@@ -262,7 +262,7 @@ jobs:
262262
fail-fast: false
263263
matrix:
264264
os: [macos-13, macos-14]
265-
ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
265+
ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
266266
exclude:
267267
# setup-ruby does not provide ruby 2.4 or 2.5 on arm64-darwin as of 2024-05-01
268268
- os: macos-14
@@ -301,6 +301,9 @@ jobs:
301301
- os: windows-latest
302302
ruby: "3.3"
303303
platform: x64-mingw-ucrt
304+
- os: windows-latest
305+
ruby: "head" # "3.4.0-rc1" not available yet on windows
306+
platform: x64-mingw-ucrt
304307
runs-on: ${{ matrix.os }}
305308
steps:
306309
- uses: actions/checkout@v4
@@ -353,6 +356,9 @@ jobs:
353356
- os: windows-latest
354357
ruby: "3.3"
355358
platform: x64-mingw-ucrt
359+
- os: windows-latest
360+
ruby: "head" # "3.4.0-rc1" not available yet on windows
361+
platform: x64-mingw-ucrt
356362
runs-on: ${{ matrix.os }}
357363
steps:
358364
- uses: actions/checkout@v4

Dockerfile.mri.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
110110
xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
111111
[
112112
# Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
113-
["3.3.5:3.2.0:3.1.0", "3.1.3"],
113+
["3.4.0-rc1:3.3.5:3.2.0:3.1.0", "3.1.3"],
114114
]
115115
elsif platform =~ /x64-mingw32/
116116
[
@@ -121,7 +121,7 @@ elsif platform =~ /x64-mingw32/
121121
else
122122
[
123123
["2.6.0:2.5.0:2.4.0", "2.5.9"],
124-
["3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
124+
["3.4.0-rc1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
125125
]
126126
end
127127

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

218218
RUN bash -c "rbenv global 3.1.3"
219219

220-
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
220+
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
221221

222222
CMD bash

History.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `rake-compiler/rake-compiler-dock` Changelog
22

3+
## next / unreleased
4+
5+
### Ruby 3.4 support
6+
7+
- Add Ruby 3.4.0-rc1 cross-compilation support.
8+
9+
310
## v1.6.0 / 2024-12-13
411

512
### Notable changes

0 commit comments

Comments
 (0)