diff options
| author | bors <bors@rust-lang.org> | 2024-10-23 19:26:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-23 19:26:00 +0000 |
| commit | 4f2f477fded0a47b21ed3f6aeddeafa5db8bf518 (patch) | |
| tree | 604f5084a58bb706c0c69043aee5575db1c1607e /src/ci/docker | |
| parent | be01dabfefd2daa4574b974f571c7852085d60cb (diff) | |
| parent | 5f0626cdb159569e03390573bbd48b162567a4da (diff) | |
| download | rust-4f2f477fded0a47b21ed3f6aeddeafa5db8bf518.tar.gz rust-4f2f477fded0a47b21ed3f6aeddeafa5db8bf518.zip | |
Auto merge of #132070 - fmease:rollup-4i4k587, r=fmease
Rollup of 5 pull requests Successful merges: - #131043 (Refactor change detection for rustdoc and download-rustc) - #131181 (Compiletest: Custom differ) - #131487 (Add wasm32v1-none target (compiler-team/#791)) - #132054 (do not remove `.cargo` directory) - #132058 (CI: rfl: use rust-next temporary commit) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-various-2/Dockerfile | 1 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile index 410f0f92e60..8aabfaafbab 100644 --- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile @@ -118,6 +118,7 @@ ENV TARGETS=$TARGETS,wasm32-wasi ENV TARGETS=$TARGETS,wasm32-wasip1 ENV TARGETS=$TARGETS,wasm32-wasip1-threads ENV TARGETS=$TARGETS,wasm32-wasip2 +ENV TARGETS=$TARGETS,wasm32v1-none ENV TARGETS=$TARGETS,sparcv9-sun-solaris ENV TARGETS=$TARGETS,x86_64-pc-solaris ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32 diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 27dbfc6040c..f07515f7784 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -2,7 +2,7 @@ set -euo pipefail -LINUX_VERSION=v6.12-rc2 +LINUX_VERSION=28e848386b92645f93b9f2fdba5882c3ca7fb3e2 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt |