Skip to content

Commit 9c0f2c0

Browse files
committed
Build Ruby 3.5 or greater with zjit
zjit is the next step in ruby jitting. More details at https://bugs.ruby-lang.org/issues/21221 ZJIT requires rust 1.85, so bump the version.
1 parent 7381a0d commit 9c0f2c0

File tree

8 files changed

+32
-23
lines changed

8 files changed

+32
-23
lines changed

3.5-rc/alpine3.21/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.5-rc/alpine3.22/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.5-rc/bookworm/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.5-rc/bullseye/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.5-rc/slim-bookworm/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.5-rc/slim-bullseye/Dockerfile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ RUN set -eux; \
207207
--disable-install-doc \
208208
--enable-shared \
209209
${rustArch:+--enable-yjit} \
210+
{{ if env.version | IN("3.2", "3.3", "3.4") then "" else ( -}}
211+
${rustArch:+--enable-zjit} \
212+
{{ ) end -}}
210213
; \
211214
make -j "$(nproc)"; \
212215
make install; \

rust.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
{
22
"rust": {
3-
"version": "1.84.0"
3+
"version": "1.88.0"
44
},
55
"rustup": {
66
"arches": {
77
"amd64": {
88
"glibc": {
99
"arch": "x86_64-unknown-linux-gnu",
10-
"sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d",
11-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init"
10+
"sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c",
11+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init"
1212
},
1313
"musl": {
1414
"arch": "x86_64-unknown-linux-musl",
15-
"sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47",
16-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init"
15+
"sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2",
16+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init"
1717
}
1818
},
1919
"arm32v5": {
2020
"glibc": {
2121
"arch": "arm-unknown-linux-gnueabi",
22-
"sha256": "3e347090c436066be3d1d170f8c6743b5f9aab89c0a175e2e0dc902abea6b739",
23-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabi/rustup-init"
22+
"sha256": "3ec755aaa801bdca4caba35cfe3d1657c9c117d87e2e4dd355ab98539115ad45",
23+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/arm-unknown-linux-gnueabi/rustup-init"
2424
}
2525
},
2626
"arm32v6": {
2727
"glibc": {
2828
"arch": "arm-unknown-linux-gnueabihf",
29-
"sha256": "5568c68b02f2ca1ddc8c448badc4b0b2750bee3e50fe51a28c35f5b7792e36a2",
30-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabihf/rustup-init"
29+
"sha256": "231a2a004e6e446a1944f957d0eaed858fb9a549264db8dd00a30f491fc67eb8",
30+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/arm-unknown-linux-gnueabihf/rustup-init"
3131
}
3232
},
3333
"arm32v7": {
3434
"glibc": {
3535
"arch": "armv7-unknown-linux-gnueabihf",
36-
"sha256": "3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed",
37-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/armv7-unknown-linux-gnueabihf/rustup-init"
36+
"sha256": "3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61",
37+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/armv7-unknown-linux-gnueabihf/rustup-init"
3838
}
3939
},
4040
"arm64v8": {
4141
"glibc": {
4242
"arch": "aarch64-unknown-linux-gnu",
43-
"sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2",
44-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init"
43+
"sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c",
44+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init"
4545
},
4646
"musl": {
4747
"arch": "aarch64-unknown-linux-musl",
48-
"sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64",
49-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init"
48+
"sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9",
49+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init"
5050
}
5151
},
5252
"i386": {
5353
"glibc": {
5454
"arch": "i686-unknown-linux-gnu",
55-
"sha256": "0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237",
56-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/i686-unknown-linux-gnu/rustup-init"
55+
"sha256": "a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f",
56+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/i686-unknown-linux-gnu/rustup-init"
5757
}
5858
},
5959
"mips64le": {
6060
"glibc": {
6161
"arch": "mips64el-unknown-linux-gnuabi64",
6262
"sha256": "644cec63e594707a6098585038cf47e28546c2abe0dde7149cde71d79a0be674",
63-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/mips64el-unknown-linux-gnuabi64/rustup-init"
63+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/mips64el-unknown-linux-gnuabi64/rustup-init"
6464
}
6565
},
6666
"ppc64le": {
6767
"glibc": {
6868
"arch": "powerpc64le-unknown-linux-gnu",
69-
"sha256": "079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38",
70-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/powerpc64le-unknown-linux-gnu/rustup-init"
69+
"sha256": "acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0",
70+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/powerpc64le-unknown-linux-gnu/rustup-init"
7171
}
7272
},
7373
"s390x": {
7474
"glibc": {
7575
"arch": "s390x-unknown-linux-gnu",
76-
"sha256": "e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c",
77-
"url": "https://static.rust-lang.org/rustup/archive/1.27.1/s390x-unknown-linux-gnu/rustup-init"
76+
"sha256": "726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572",
77+
"url": "https://static.rust-lang.org/rustup/archive/1.28.2/s390x-unknown-linux-gnu/rustup-init"
7878
}
7979
}
8080
},
81-
"version": "1.27.1"
81+
"version": "1.28.2"
8282
}
8383
}

0 commit comments

Comments
 (0)