Skip to content

Commit 6d54239

Browse files
committed
Update Rust to v1.56.1 (#1431)
Some development tooling (like recent versions of cargo-deny) depends on Rust v1.56.1. This change updates proxy build/CI to use this version for consistency. (cherry picked from commit 526c0df) Signed-off-by: Oliver Gould <ver@buoyant.io>
1 parent cf3304a commit 6d54239

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/actions/package/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=rust:1.56.0-buster
1+
ARG BASE_IMAGE=rust:1.56.1-buster
22
FROM $BASE_IMAGE
33
WORKDIR /linkerd
44
RUN apt-get update && \

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212
timeout-minutes: 30
1313
container:
14-
image: docker://rust:1.56.0-buster
15-
options: --security-opt seccomp=unconfined
14+
image: docker://rust:1.56.1-buster
15+
options: --security-opt seccomp=unconfined # 🤷
1616
steps:
1717
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
1818
- run: cargo install cargo-tarpaulin

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# :; docker buildx build . --load
1818

1919
# Please make changes via update-rust-version.sh
20-
ARG RUST_IMAGE=rust:1.56.0-buster
20+
ARG RUST_IMAGE=rust:1.56.1-buster
2121

2222
# Use an arbitrary ~recent edge release image to get the proxy
2323
# identity-initializing and linkerd-await wrappers.
@@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
4141
WORKDIR /usr/src/linkerd2-proxy
4242
COPY . .
4343
RUN --mount=type=cache,target=target \
44-
--mount=type=cache,from=rust:1.56.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
44+
--mount=type=cache,from=rust:1.56.1-buster,source=/usr/local/cargo,target=/usr/local/cargo \
4545
mkdir -p /out && \
4646
if [ -n "$PROXY_UNOPTIMIZED" ]; then \
4747
(cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --features="$PROXY_FEATURES") && \

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.56.0
1+
1.56.1

0 commit comments

Comments
 (0)