From af8c9e1f2561b3d2b32903e03acab9dc1bf44be4 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 18 Jul 2022 12:38:07 -0700 Subject: [PATCH] chore(releasing): Pin to cross 0.2.4 (#13604) 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: https://github.com/cross-rs/cross/issues/960 Fixes: #13600 Signed-off-by: Jesse Szwedko --- scripts/cross/aarch64-unknown-linux-gnu.dockerfile | 2 +- scripts/cross/aarch64-unknown-linux-musl.dockerfile | 2 +- scripts/cross/armv7-unknown-linux-gnueabihf.dockerfile | 2 +- scripts/cross/armv7-unknown-linux-musleabihf.dockerfile | 2 +- scripts/cross/powerpc-unknown-linux-gnu.dockerfile | 2 +- scripts/cross/powerpc64le-unknown-linux-gnu.dockerfile | 2 +- scripts/cross/x86_64-unknown-linux-gnu.dockerfile | 2 +- scripts/cross/x86_64-unknown-linux-musl.dockerfile | 2 +- scripts/environment/prepare.sh | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/cross/aarch64-unknown-linux-gnu.dockerfile b/scripts/cross/aarch64-unknown-linux-gnu.dockerfile index 00382b5994307..9eeda3a920caa 100644 --- a/scripts/cross/aarch64-unknown-linux-gnu.dockerfile +++ b/scripts/cross/aarch64-unknown-linux-gnu.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main +FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/aarch64-unknown-linux-musl.dockerfile b/scripts/cross/aarch64-unknown-linux-musl.dockerfile index 2d08d528bc8b0..cc1c2002f1039 100644 --- a/scripts/cross/aarch64-unknown-linux-musl.dockerfile +++ b/scripts/cross/aarch64-unknown-linux-musl.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:main +FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/armv7-unknown-linux-gnueabihf.dockerfile b/scripts/cross/armv7-unknown-linux-gnueabihf.dockerfile index db7e3ec0d29cd..27531a1760f91 100644 --- a/scripts/cross/armv7-unknown-linux-gnueabihf.dockerfile +++ b/scripts/cross/armv7-unknown-linux-gnueabihf.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main +FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile b/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile index e3fe9cb2e6891..5d74d617325c4 100644 --- a/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile +++ b/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:main +FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/powerpc-unknown-linux-gnu.dockerfile b/scripts/cross/powerpc-unknown-linux-gnu.dockerfile index 29ccd15449d53..c2c54b2c3a529 100644 --- a/scripts/cross/powerpc-unknown-linux-gnu.dockerfile +++ b/scripts/cross/powerpc-unknown-linux-gnu.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/powerpc-unknown-linux-gnu:main +FROM ghcr.io/cross-rs/powerpc-unknown-linux-gnu:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/powerpc64le-unknown-linux-gnu.dockerfile b/scripts/cross/powerpc64le-unknown-linux-gnu.dockerfile index 46681706d982f..d31d96337cf7f 100644 --- a/scripts/cross/powerpc64le-unknown-linux-gnu.dockerfile +++ b/scripts/cross/powerpc64le-unknown-linux-gnu.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:main +FROM ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/x86_64-unknown-linux-gnu.dockerfile b/scripts/cross/x86_64-unknown-linux-gnu.dockerfile index 94e72cbe16754..2832bcc3494cb 100644 --- a/scripts/cross/x86_64-unknown-linux-gnu.dockerfile +++ b/scripts/cross/x86_64-unknown-linux-gnu.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main +FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/cross/x86_64-unknown-linux-musl.dockerfile b/scripts/cross/x86_64-unknown-linux-musl.dockerfile index dcc1a0c424a12..e045b74c0be14 100644 --- a/scripts/cross/x86_64-unknown-linux-musl.dockerfile +++ b/scripts/cross/x86_64-unknown-linux-musl.dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:main +FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:0.2.4 COPY bootstrap-ubuntu.sh . RUN ./bootstrap-ubuntu.sh diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh index 87017514dd025..78ea40e368b47 100755 --- a/scripts/environment/prepare.sh +++ b/scripts/environment/prepare.sh @@ -4,10 +4,10 @@ set -e -o verbose rustup show # causes installation of version from rust-toolchain.toml rustup default "$(rustup show active-toolchain | awk '{print $1;}')" if [[ "$(cargo-deb --version)" != "1.29.2" ]] ; then - rustup run stable cargo install cargo-deb --version 1.29.2 --force + rustup run stable cargo install cargo-deb --version 1.29.2 --force --locked fi -if [[ "$(cross --version | grep cross)" != "cross 0.2.1" ]] ; then - rustup run stable cargo install cross --version 0.2.1 --force +if [[ "$(cross --version | grep cross)" != "cross 0.2.4" ]] ; then + rustup run stable cargo install cross --version 0.2.4 --force --locked fi if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.11" ]] ; then rustup run stable cargo install cargo-nextest --version 0.9.11 --force