summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/docker/x86_64-unknown-linux-musl/Dockerfile2
-rw-r--r--ci/utils.sh4
2 files changed, 4 insertions, 2 deletions
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"