Skip to content

Commit

Permalink
ci: fix musl docker build
Browse files Browse the repository at this point in the history
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: cross-rs/cross#357
We work around that bug by installing the master branch of cross. Sigh.
  • Loading branch information
BurntSushi committed Jan 10, 2020
1 parent 0fb3f6a commit bf0ddc4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cross.toml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion ci/docker/x86_64-unknown-linux-musl/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion ci/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit bf0ddc4

Please sign in to comment.