diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-09-10 14:17:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 14:17:39 +0200 |
| commit | f0bf4f3d6bd6c566a5012c7d0c98a53ccc700f69 (patch) | |
| tree | d559d2ea759d6c1f4f9bedcd514e5346c4de949d | |
| parent | 422c76adae98b55d13a07a8fb47d8bc47fa96fdf (diff) | |
| parent | e3dfcb26cd816046451a4dc85a85c5294245ded7 (diff) | |
| download | rust-f0bf4f3d6bd6c566a5012c7d0c98a53ccc700f69.tar.gz rust-f0bf4f3d6bd6c566a5012c7d0c98a53ccc700f69.zip | |
Rollup merge of #146368 - ojeda:rfl, r=lqd
CI: rfl: move job forward to Linux v6.17-rc5 to remove temporary commits v6.17-rc5 contains the equivalent of the two commits we had here, thus move the Rust for Linux job forward to that so that we don't need the temporary commits anymore. r? ```@lqd``` ```@Kobzol``` try-job: x86_64-rust-for-linux ```@rustbot``` label A-rust-for-linux ```@bors``` try
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 7e0fb5794f4..b7d7151b171 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -2,9 +2,7 @@ set -euo pipefail -# https://github.com/rust-lang/rust/pull/144443 -# https://github.com/rust-lang/rust/pull/145928 -LINUX_VERSION=8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b +LINUX_VERSION=v6.17-rc5 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt |