Update free-disk-space.sh

Author: ChrisDenton

.github/workflows/ci.yml

@@ -123,12 +123,12 @@ jobs:
           echo "disk usage:"
           df -h
 
-      # Free up disk space on Linux by removing preinstalled components that
+      # Free up disk space on Linux and Windows by removing preinstalled components that
       # we do not need. We do this to enable some of the less resource
       # intensive jobs to run on free runners, which however also have
       # less disk space.
-      - name: free up disk space
-        run: src/ci/scripts/free-disk-space.sh
+      - name: free up disk space start
+        run: RUNNER_TRACKING_ID="" src/ci/scripts/free-disk-space.sh start
         if: matrix.free_disk
 
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
@@ -229,6 +229,10 @@ jobs:
         run: |
           cd src/ci/citool
           CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build
+      
+      - name: free up disk space report
+        run: src/ci/scripts/free-disk-space.sh report
+        if: matrix.free_disk
 
       - name: run the build
         run: |

src/bootstrap/download-ci-llvm-stamp

@@ -1,4 +1,4 @@
 Change this file to make users of the `download-ci-llvm` configuration download
 a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.
 
-Last change is for: ????
+Last change is for: https://github.com/rust-lang/rust/pull/120761

src/ci/github-actions/jobs.yml

@@ -32,12 +32,14 @@ runners:
 
   - &job-windows
     os: windows-2025
+    free_disk: true
     <<: *base-job
 
   # NOTE: windows-2025 has less disk space available than windows-2022,
   # because the D drive is missing.
   - &job-windows-25
     os: windows-2025
+    free_disk: true
     <<: *base-job
 
   - &job-windows-8c

src/ci/scripts/free-disk-space-linux.sh

@@ -250,7 +250,7 @@ AVAILABLE_INITIAL=$(getAvailableSpace)
 
 printDF "BEFORE CLEAN-UP:"
 echo ""
-
+exit 1
 execAndMeasureSpaceChange cleanPackages "Unused packages"
 execAndMeasureSpaceChange cleanDocker "Docker images"
 execAndMeasureSpaceChange cleanSwap "Swap storage"

src/ci/scripts/free-disk-space.sh

@@ -1,17 +1,20 @@
 #!/bin/bash
 set -euo pipefail
 
+script_dir=$(dirname "$0")
 log=/tmp/free-disk-space.log
 
-if [[ "$1" == "start"]]; then
+if [[ "$1" == "start" ]]; then
     # Run scripts in the background.
     if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
-        pwsh free-disk-space-windows.ps1 &> $log &
+        pwsh $script_dir/free-disk-space-windows.ps1 &> $log &
     else
-        free-disk-space-linux.sh &> $log &
+        $script_dir/free-disk-space-linux.sh &> $log &
     fi
-elif [[ "$1" == "report"]]; then
-    exit_code=wait
+    echo "FREE_DISK_SPACE_PID=$!" >> $GITHUB_ENV
+elif [[ "$1" == "report" ]]; then
+    wait $FREE_DISK_SPACE_PID
+    exit_code=$?
     cat $log
     exit $exit_code
 else