Skip to content

Commit 3545698

Browse files
committed
Auto merge of rust-lang#147518 - dianqk:update-llvm, r=cuviper,Kobzol
Update LLVM to 21.1.3 Fixes rust-lang#146742. After rust-lang#146124, we need more space to run x86_64-gnu-distcheck if building LLVM from source. According to the building log, the space freed by `free-disk-space-linux.sh` is not entirely available. ``` You are running out of disk space. The runner will stop working when the machine runs out of disk space. Free space left: 98 MB disk usage: Filesystem Size Used Avail Use% Mounted on /dev/root 72G 43G 29G 60% / tmpfs 7.9G 84K 7.9G 1% /dev/shm tmpfs 3.2G 1.2M 3.2G 1% /run tmpfs 5.0M 0 5.0M 0% /run/lock /dev/sda16 881M 60M 760M 8% /boot /dev/sda15 105M 6.2M 99M 6% /boot/efi /dev/sdb1 74G 28K 70G 1% /mnt tmpfs 1.6G 12K 1.6G 1% /run/user/1001 ```
2 parents 36e4f5d + a3482d9 commit 3545698

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ jobs:
246246
run: src/ci/scripts/create-doc-artifacts.sh
247247

248248
- name: print disk usage
249+
# We also want to know the disk usage when the job fails.
250+
if: always()
249251
run: |
250252
echo "disk usage:"
251253
df -h

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,6 +3276,8 @@ fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: &Path) {
32763276
.env("GITHUB_ACTIONS", "0")
32773277
.current_dir(plain_src_dir)
32783278
.run(builder);
3279+
// Mitigate pressure on small-capacity disks.
3280+
builder.remove_dir(plain_src_dir);
32793281
}
32803282

32813283
/// Check that rust-src has all of libstd's dependencies
@@ -3301,6 +3303,8 @@ fn distcheck_rust_src(builder: &Builder<'_>, src_dir: &Path) {
33013303
.arg(&toml)
33023304
.current_dir(src_dir)
33033305
.run(builder);
3306+
// Mitigate pressure on small-capacity disks.
3307+
builder.remove_dir(src_dir);
33043308
}
33053309

33063310
/// Check that rustc-dev's compiler crate source code can be loaded with `cargo metadata`
@@ -3325,6 +3329,8 @@ fn distcheck_rustc_dev(builder: &Builder<'_>, dir: &Path) {
33253329
.env("RUSTC", &builder.initial_rustc)
33263330
.current_dir(dir)
33273331
.run(builder);
3332+
// Mitigate pressure on small-capacity disks.
3333+
builder.remove_dir(dir);
33283334
}
33293335

33303336
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

0 commit comments

Comments
 (0)