Rust update to 1.83 #4935
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,6 +76,7 @@ RUN apt-get update \ | |
| tzdata \ | ||
| tini \ | ||
| squashfs-tools zstd \ | ||
| python3-seccomp \ | ||
| # for aws-lc-rs | ||
| cmake \ | ||
| # for Qemu vhost-user-blk backend | ||
|
|
@@ -98,8 +99,13 @@ RUN cd /tmp/poetry \ | |
| ENV VIRTUAL_ENV=$VENV | ||
| ENV PATH=$VENV/bin:$PATH | ||
|
|
||
| # apt-get installs it globally, to manually copy it into the venv | ||
| RUN cp /usr/lib/python3/dist-packages/seccomp.cpython-312-"$ARCH"-linux-gnu.so "$VENV"/lib/python3.12/site-packages/ | ||
ShadowCurse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # Running the three as a single dockerfile command to avoid inflation of the image: | ||
| # - Install the Rust toolchain. | ||
| # - Kani always installs _some_ nightly toolchain, we reuse it for the seccomp filter analysis test. Dynamically | ||
| # determine the exact toolchain name, and install more components into it. | ||
| # - Build and install crosvm (used as vhost-user-blk backend) | ||
| # - Clean up cargo compilation directories | ||
| # - Always install both x86_64 and aarch64 musl targets, as our rust-toolchain.toml would force on-the-fly installation of both anyway | ||
|
|
@@ -110,6 +116,10 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-too | |
| && cargo install --locked cargo-audit [email protected] grcov cargo-sort cargo-afl \ | ||
| && cargo install --locked kani-verifier && cargo kani setup \ | ||
| \ | ||
| && NIGHTLY_TOOLCHAIN=$(rustup toolchain list | grep nightly | tr -d '\n') \ | ||
|
There was a problem hiding this comment. nit: I think you don't need the There was a problem hiding this comment. I do, otherwise the interpolation of $NIGHTLY_TOOLCHAIN into the There was a problem hiding this comment. now that I'm thinking about it, maybe that was in python... |
||
| && rustup component add rust-src --toolchain "$NIGHTLY_TOOLCHAIN" \ | ||
|
There was a problem hiding this comment. why is it needed? any rough estimate how much space it takes? There was a problem hiding this comment. the static analysis thingy uses -Zbuild_std, to compile the standard library as non-PIE, and for that we need to have the source of the standard library around. Its 28.8MB |
||
| && rustup target add "$ARCH"-unknown-linux-musl --toolchain "$NIGHTLY_TOOLCHAIN" \ | ||
| \ | ||
| && apt-get update \ | ||
| && apt-get -y install --no-install-recommends \ | ||
| libcap-dev \ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"to manually copy" -> "manually copy it so we can use it in the venv"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yeah, I meant "so manually copy", not "to"