rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-03-17 20:28:03 +02:00
Code Issues Releases Activity

ci: fix musl docker build

Browse Source 
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.
This commit is contained in:
Andrew Gallant 2020-01-09 21:54:28 -05:00
parent 0fb3f6a159
commit bf0ddc4675
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cross.toml
View File

@ -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
ci/docker/x86_64-unknown-linux-musl/Dockerfile
View File

@ -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 \

4
ci/utils.sh
View File

@ -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"