diff options
| author | bors <bors@rust-lang.org> | 2024-10-08 20:45:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-08 20:45:49 +0000 |
| commit | 6f4ae0f34503601e54680a137c1db0b81b56cc3d (patch) | |
| tree | 52cde55ca91c51f779d57c424f8610523c75f197 /src/ci | |
| parent | a49aefcd8bc65fe4cf10a069e55ff1a671bbfae0 (diff) | |
| parent | cb252eef79e83321a128c1d90ff3469eb1cd8b39 (diff) | |
| download | rust-6f4ae0f34503601e54680a137c1db0b81b56cc3d.tar.gz rust-6f4ae0f34503601e54680a137c1db0b81b56cc3d.zip | |
Auto merge of #131412 - matthiaskrgr:rollup-478o6h6, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #131378 (CI: rfl: move job forward to Linux v6.12-rc2) - #131400 (Simplify the compiletest directives for ignoring coverage-test modes) - #131408 (Remove unneeded argument of `LinkCollector::verify_disambiguator`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 8011e07e92e..27dbfc6040c 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=4c7864e81d8bbd51036dacf92fb0a400e13aaeee +LINUX_VERSION=v6.12-rc2 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt |
