Skip to content

Commit a1ca04d

Browse files
shekhirinlwedge99
authored andcommitted
ci: pin Rust to 1.88 when building for Windows in Cross (paradigmxyz#18320)
1 parent 0c03a47 commit a1ca04d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Dockerfile.x86_64-pc-windows-gnu

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends git
1717

1818
RUN git clone https://github.com/cross-rs/cross /cross
1919
WORKDIR /cross/docker
20-
RUN git checkout 9e2298e17170655342d3248a9c8ac37ef92ba38f
20+
RUN git checkout baf457efc2555225af47963475bd70e8d2f5993f
21+
22+
# xargo doesn't work with Rust 1.89 and higher: https://github.com/cross-rs/cross/issues/1701.
23+
#
24+
# When this PR https://github.com/cross-rs/cross/pull/1580 is merged,
25+
# we can update the checkout above and remove this replacement.
26+
RUN sed -i 's|sh rustup-init.sh -y --no-modify-path --profile minimal|sh rustup-init.sh -y --no-modify-path --profile minimal --default-toolchain=1.88.0|' xargo.sh
2127

2228
RUN cp common.sh lib.sh / && /common.sh
2329
RUN cp cmake.sh / && /cmake.sh

0 commit comments

Comments
 (0)