Update cargo install instructions to declare 'trunk' branch

See also rust-lang/cargo#3517. Breakage caused by artichoke/artichoke#961.
artichoke · Dec 18, 2020 · 8e5fa45 · 8e5fa45
1 parent 7489a0f
commit 8e5fa45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -63,7 +63,10 @@ ARG ARTICHOKE_NIGHTLY_VER=latest
 RUN apt-get install -y musl-tools
 # Install artichoke
 RUN set -eux; \
-    RUSTFLAGS="-C link-arg=-s" cargo install --git https://github.com/artichoke/artichoke --locked artichoke \
+    RUSTFLAGS="-C link-arg=-s" cargo install \
+    --git https://github.com/artichoke/artichoke \
+    --branch trunk \
+    --locked artichoke \
     --target x86_64-unknown-linux-musl; \
     airb --version; \
     artichoke --version;

diff --git a/debian/buster/slim/Dockerfile b/debian/buster/slim/Dockerfile
@@ -57,7 +57,10 @@ RUN set -eux; \
 ARG ARTICHOKE_NIGHTLY_VER=latest
 # Install artichoke
 RUN set -eux; \
-    RUSTFLAGS="-C link-arg=-s" cargo install --git https://github.com/artichoke/artichoke --locked artichoke; \
+    RUSTFLAGS="-C link-arg=-s" cargo install \
+    --git https://github.com/artichoke/artichoke \
+    --branch trunk \
+    --locked artichoke; \
     airb --version; \
     artichoke --version;
 

diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile
@@ -57,7 +57,10 @@ RUN set -eux; \
 ARG ARTICHOKE_NIGHTLY_VER=latest
 # Install artichoke
 RUN set -eux; \
-    RUSTFLAGS="-C link-arg=-s" cargo install --git https://github.com/artichoke/artichoke --locked artichoke; \
+    RUSTFLAGS="-C link-arg=-s" cargo install \
+    --git https://github.com/artichoke/artichoke \
+    --branch trunk \
+    --locked artichoke; \
     airb --version; \
     artichoke --version;