Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump MSRV to 1.73 #4692

Merged
merged 10 commits into from
Oct 24, 2023
Merged

chore: bump MSRV to 1.73 #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b210c36
Bump MSRV to 1.73
thomaseizinger Oct 20, 2023
6aa4bb7
Merge branch 'master' into deps/bump-rust-1.75
thomaseizinger Oct 22, 2023
6123a1b
Update libp2p/CHANGELOG.md
thomaseizinger Oct 22, 2023
ab62674
Activate manual-let-else lint
thomaseizinger Oct 20, 2023
10e52f5
Update version of Rust used in dockerfiles
thomaseizinger Oct 22, 2023
5acc909
Update Cargo.toml
thomaseizinger Oct 23, 2023
4bed439
Statically link `interop-tests` bin
thomaseizinger Oct 24, 2023
b06ca0e
Merge remote-tracking branch 'origin/deps/bump-rust-1.75' into deps/b…
thomaseizinger Oct 24, 2023
8965f6d
Fix docker image
thomaseizinger Oct 24, 2023
e8dd295
Merge branch 'master' into deps/bump-rust-1.75
mergify[bot] Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ members = [
resolver = "2"

[workspace.package]
rust-version = "1.65.0"
rust-version = "1.73.0"

[workspace.dependencies]
futures-bounded = { version = "0.1.0", path = "misc/futures-bounded" }
Expand Down
8 changes: 4 additions & 4 deletions interop-tests/Dockerfile.chromium
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.5-labs
FROM rust:1.67.0 as chef
FROM rust:1.73.0 as chef
RUN rustup target add wasm32-unknown-unknown
RUN wget -q -O- https://github.com/rustwasm/wasm-pack/releases/download/v0.12.1/wasm-pack-v0.12.1-x86_64-unknown-linux-musl.tar.gz | tar -zx -C /usr/local/bin --strip-components 1 --wildcards "wasm-pack-*/wasm-pack"
RUN wget -q -O- https://github.com/WebAssembly/binaryen/releases/download/version_115/binaryen-version_115-x86_64-linux.tar.gz | tar -zx -C /usr/local/bin --strip-components 2 --wildcards "binaryen-version_*/bin/wasm-opt"
Expand All @@ -14,13 +14,13 @@ FROM chef AS builder
COPY --from=planner /app/recipe.json recipe.json
# Build dependencies - this is the caching Docker layer!
RUN cargo chef cook --release --package interop-tests --target wasm32-unknown-unknown --recipe-path recipe.json
RUN cargo chef cook --release --package interop-tests --bin wasm_ping --recipe-path recipe.json
RUN RUSTFLAGS='-C target-feature=+crt-static' cargo chef cook --release --package interop-tests --target x86_64-unknown-linux-gnu --bin wasm_ping --recipe-path recipe.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a short comment why this is needed? For future us to eventually go back to the provided glibc?

# Build application
COPY . .
RUN wasm-pack build --target web interop-tests
RUN cargo build --release --package interop-tests --bin wasm_ping
RUN RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --package interop-tests --target x86_64-unknown-linux-gnu --bin wasm_ping

FROM selenium/standalone-chrome:115.0
COPY --from=builder /app/target/release/wasm_ping /usr/local/bin/testplan
COPY --from=builder /app/target/x86_64-unknown-linux-gnu/release/wasm_ping /usr/local/bin/testplan
ENV RUST_BACKTRACE=1
ENTRYPOINT ["testplan"]
10 changes: 5 additions & 5 deletions interop-tests/Dockerfile.native
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.5-labs
FROM rust:1.67.0 as chef
FROM rust:1.73.0 as chef
RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
WORKDIR /app

Expand All @@ -10,12 +10,12 @@ RUN cargo chef prepare --recipe-path recipe.json
FROM chef AS builder
COPY --from=planner /app/recipe.json recipe.json
# Build dependencies - this is the caching Docker layer!
RUN cargo chef cook --release --package interop-tests --bin native_ping --recipe-path recipe.json
RUN RUSTFLAGS='-C target-feature=+crt-static' cargo chef cook --release --package interop-tests --target x86_64-unknown-linux-gnu --bin native_ping --recipe-path recipe.json
# Build application
COPY . .
RUN cargo build --release --package interop-tests --bin native_ping
RUN RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --package interop-tests --target x86_64-unknown-linux-gnu --bin native_ping

FROM gcr.io/distroless/cc
COPY --from=builder /app/target/release/native_ping /usr/local/bin/testplan
FROM scratch
COPY --from=builder /app/target/x86_64-unknown-linux-gnu/release/native_ping /usr/local/bin/testplan
ENV RUST_BACKTRACE=1
ENTRYPOINT ["testplan"]
2 changes: 2 additions & 0 deletions libp2p/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## 0.53.0 - unreleased

- Raise MSRV to 1.73.
See [PR 4692](https://github.com/libp2p/rust-libp2p/pull/4692).
- Remove deprecated `libp2p-wasm-ext`.
Users should use `libp2p-websocket-websys` instead.
See [PR 4694](https://github.com/libp2p/rust-libp2p/pull/4694).
Expand Down
2 changes: 1 addition & 1 deletion misc/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.5-labs
FROM rust:1.67.0 as chef
FROM rust:1.73.0 as chef
RUN wget -q -O- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.62/cargo-chef-x86_64-unknown-linux-gnu.tar.gz | tar -zx -C /usr/local/bin
RUN cargo install --locked --root /usr/local libp2p-lookup --version 0.6.4
WORKDIR /app
Expand Down