Update to Rust 1.42.0 (#483)

Also, modify update-rust-version.sh to operate on all Dockerfiles in the
repo.
This commit is contained in:
Oliver Gould 2020-04-17 11:40:13 -07:00 committed by GitHub
parent fb56712562
commit 9e9df8fff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=rust:1.41.0-buster ARG BASE_IMAGE=rust:1.42.0-buster
FROM $BASE_IMAGE FROM $BASE_IMAGE
WORKDIR /linkerd WORKDIR /linkerd
RUN apt-get update && \ RUN apt-get update && \

View File

@ -1,5 +1,5 @@
# Intended to be run on a remote DOCKER_HOST # Intended to be run on a remote DOCKER_HOST
ARG RUST_IMAGE=rust:1.37.0-buster ARG RUST_IMAGE=rust:1.42.0-buster
FROM $RUST_IMAGE as build FROM $RUST_IMAGE as build
WORKDIR /usr/src/linkerd2-proxy WORKDIR /usr/src/linkerd2-proxy
COPY . ./ COPY . ./

View File

@ -10,7 +10,7 @@ jobs:
fmt: fmt:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
container: container:
image: docker://rust:1.41.0-buster image: docker://rust:1.42.0-buster
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- run: rustup component add rustfmt - run: rustup component add rustfmt
@ -19,7 +19,7 @@ jobs:
lib: lib:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
container: container:
image: docker://rust:1.41.0-buster image: docker://rust:1.42.0-buster
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- run: make test-lib - run: make test-lib

View File

@ -17,7 +17,7 @@
# :; docker buildx build . --load # :; docker buildx build . --load
# Please make changes via update-rust-version.sh # Please make changes via update-rust-version.sh
ARG RUST_IMAGE=rust:1.41.0-buster ARG RUST_IMAGE=rust:1.42.0-buster
# Use an arbitrary ~recent edge release image to get the proxy # Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing wrapper. # identity-initializing wrapper.
@ -38,7 +38,7 @@ ARG PROXY_FEATURES
WORKDIR /usr/src/linkerd2-proxy WORKDIR /usr/src/linkerd2-proxy
COPY . . COPY . .
RUN --mount=type=cache,target=target \ RUN --mount=type=cache,target=target \
--mount=type=cache,from=rust:1.41.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \ --mount=type=cache,from=rust:1.42.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
mkdir -p /out && \ mkdir -p /out && \
if [ -n "$PROXY_UNOPTIMIZED" ]; then \ if [ -n "$PROXY_UNOPTIMIZED" ]; then \
(cd linkerd2-proxy && cargo build --locked --features="$PROXY_FEATURES") && \ (cd linkerd2-proxy && cargo build --locked --features="$PROXY_FEATURES") && \

View File

@ -1,4 +1,4 @@
ARG RUST_IMAGE=rust:1.41.0-buster ARG RUST_IMAGE=rust:1.42.0-buster
ARG RUNTIME_IMAGE=debian:bullseye-slim ARG RUNTIME_IMAGE=debian:bullseye-slim
ARG RUSTFLAGS="-C debuginfo=2 -C lto=off" ARG RUSTFLAGS="-C debuginfo=2 -C lto=off"
## Builds the proxy as incrementally as possible. ## Builds the proxy as incrementally as possible.

View File

@ -1 +1 @@
1.41.0 1.42.0

View File

@ -14,7 +14,7 @@ if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
fi fi
echo "$VERSION" > rust-toolchain echo "$VERSION" > rust-toolchain
sed -i'' -Ee "s/rust:[0-9]+\.[0-9]+\.[0-9]+/rust:$VERSION/" Dockerfile find . -name Dockerfile\* \
-exec sed -i'' -Ee "s|rust:[0-9]+\.[0-9]+\.[0-9]+|rust:$VERSION|" '{}' \;
find .github -name \*.yml -or -name Dockerfile\* \ find .github -name \*.yml \
-exec sed -i'' -Ee "s|rust:[0-9]+\.[0-9]+\.[0-9]+|rust:$VERSION|" '{}' \; -exec sed -i'' -Ee "s|rust:[0-9]+\.[0-9]+\.[0-9]+|rust:$VERSION|" '{}' \;