diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2020-01-09 21:54:28 -0500 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2020-01-10 15:07:47 -0500 |
| commit | bf0ddc4675602bcf31fcb7b9be8eaad7141f9c76 (patch) | |
| tree | bed92fcfd73e7af365e819e609ee2f076e6d69c4 | |
| parent | 0fb3f6a15987c4090fbea2b4deeaceaae58e8853 (diff) | |
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.
| -rw-r--r-- | Cross.toml | 2 | ||||
| -rw-r--r-- | ci/docker/x86_64-unknown-linux-musl/Dockerfile | 2 | ||||
| -rw-r--r-- | ci/utils.sh | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -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" |