Skip to content

Commit f1688fd

Browse files
committed
chore(releasing): Pin to cross 0.2.4
There appears to be a change in `main` that is causing the binaries to be built requiring a newer version of glibc (2.29). Opened cross issue here: cross-rs/cross#960 Fixes: #13600 Signed-off-by: Jesse Szwedko <[email protected]>
1 parent cb27621 commit f1688fd

9 files changed

+11
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main
1+
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh

scripts/cross/aarch64-unknown-linux-musl.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:main
1+
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main
1+
FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh

scripts/cross/armv7-unknown-linux-musleabihf.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main
1+
FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/powerpc-unknown-linux-gnu:main
1+
FROM ghcr.io/cross-rs/powerpc-unknown-linux-gnu:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:main
1+
FROM ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main
1+
FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh

scripts/cross/x86_64-unknown-linux-musl.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:main
1+
FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:0.2.4
22

33
COPY bootstrap-ubuntu.sh .
44
RUN ./bootstrap-ubuntu.sh

scripts/environment/prepare.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ set -e -o verbose
44
rustup show # causes installation of version from rust-toolchain.toml
55
rustup default "$(rustup show active-toolchain | awk '{print $1;}')"
66
if [[ "$(cargo-deb --version)" != "1.29.2" ]] ; then
7-
rustup run stable cargo install cargo-deb --version 1.29.2 --force
7+
rustup run stable cargo install cargo-deb --version 1.29.2 --force --locked
88
fi
9-
if [[ "$(cross --version | grep cross)" != "cross 0.2.1" ]] ; then
10-
rustup run stable cargo install cross --version 0.2.1 --force
9+
if [[ "$(cross --version | grep cross)" != "cross 0.2.4" ]] ; then
10+
rustup run stable cargo install cross --version 0.2.4 --force --locked
1111
fi
1212
if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.25" ]] ; then
1313
rustup run stable cargo install cargo-nextest --version 0.9.25 --force --locked

0 commit comments

Comments
 (0)