From bf0ddc4675602bcf31fcb7b9be8eaad7141f9c76 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Thu, 9 Jan 2020 21:54:28 -0500 Subject: [PATCH] ci: fix musl docker build Looks like the old japaric images are bunk. We update our docker image to be based on the new rustembedded images and configure cross to use it. Turns out that this wasn't due to a stale docker image, but rather, a bug in cross: https://github.com/rust-embedded/cross/issues/357 We work around that bug by installing the master branch of cross. Sigh. --- Cross.toml | 2 +- ci/docker/x86_64-unknown-linux-musl/Dockerfile | 2 +- ci/utils.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cross.toml b/Cross.toml index b61873b3..d16d10f0 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,2 +1,2 @@ [target.x86_64-unknown-linux-musl] -image = "burntsushi/x86_64-unknown-linux-musl:v0.1.14" +image = "burntsushi/cross:x86_64-unknown-linux-musl" diff --git a/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ci/docker/x86_64-unknown-linux-musl/Dockerfile index 5e40f9e7..0405c0c4 100644 --- a/ci/docker/x86_64-unknown-linux-musl/Dockerfile +++ b/ci/docker/x86_64-unknown-linux-musl/Dockerfile @@ -1,4 +1,4 @@ -FROM japaric/x86_64-unknown-linux-musl:v0.1.14 +FROM rustembedded/cross:x86_64-unknown-linux-musl RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/ci/utils.sh b/ci/utils.sh index f3dc96d2..f9c59339 100644 --- a/ci/utils.sh +++ b/ci/utils.sh @@ -99,7 +99,9 @@ is_osx() { builder() { if is_musl && is_x86_64; then - cargo install cross + # cargo install cross + # To work around https://github.com/rust-embedded/cross/issues/357 + cargo install --git https://github.com/rust-embedded/cross --force echo "cross" else echo "cargo"