Auto merge of rust-lang#136247 - marcoieni:free-more-space-ubuntu-24, r=<try>

[experiment] ci: free more space in ubuntu 24 free runners

try-job: x86_64-gnu-debug
try-job: armhf-gnu
try-job: dist-ohos

Author: bors

src/ci/github-actions/jobs.yml

@@ -5,7 +5,7 @@ runners:
     env: { }
 
   - &job-linux-4c
-    os: ubuntu-22.04
+    os: ubuntu-24.04
     # Free some disk space to avoid running out of space during the build.
     free_disk: true
     <<: *base-job
@@ -50,7 +50,7 @@ runners:
   - &job-aarch64-linux
     # Free some disk space to avoid running out of space during the build.
     free_disk: true
-    os: ubuntu-22.04-arm
+    os: ubuntu-24.04-arm
 
   - &job-aarch64-linux-8c
     os: ubuntu-22.04-arm64-8core-32gb
@@ -295,7 +295,7 @@ auto:
   - name: x86_64-gnu-debug
     # This seems to be needed because a full stage 2 build + run-make tests
     # overwhelms the storage capacity of the standard 4c runner.
-    <<: *job-linux-4c-largedisk
+    <<: *job-linux-4c
 
   - name: x86_64-gnu-distcheck
     <<: *job-linux-8c

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

@@ -1,8 +1,13 @@
 #!/bin/bash
+set -euo pipefail
 
 # Free disk space on Linux GitHub action runners
 # Script inspired by https://github.com/jlumbroso/free-disk-space
 
+# When updating to a new ubuntu version:
+# - Check that there are no docker images preinstalled with `docker image ls`
+# - Check that there are no big packages preinstalled that we aren't using
+
 # print a line of the specified character
 printSeparationLine() {
     for ((i = 0; i < 80; i++)); do
@@ -14,11 +19,15 @@ printSeparationLine() {
 # compute available space
 # REF: https://unix.stackexchange.com/a/42049/60849
 # REF: https://stackoverflow.com/a/450821/408734
-getAvailableSpace() { echo $(df -a | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+getAvailableSpace() {
+    df -a | awk 'NR > 1 {avail+=$4} END {print avail}'
+}
 
 # make Kb human readable (assume the input is Kb)
 # REF: https://unix.stackexchange.com/a/44087/60849
-formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
+formatByteCount() {
+    numfmt --to=iec-i --suffix=B --padding=7 "$1"'000'
+}
 
 # macro to output saved space
 printSavedSpace() {
@@ -58,11 +67,35 @@ removeDir() {
     dir=${1}
 
     local before
-    before=$(getAvailableSpace)
+    if [ ! -d "$dir" ]; then
+        echo "::warning::Directory $dir does not exist, skipping."
+    else
+        before=$(getAvailableSpace)
+        sudo rm -rf "$dir"
+        printSavedSpace "$before" "Removed $dir"
+    fi
+}
+
+removeUnusedDirectories() {
+    local dirs_to_remove=(
+        "/usr/local/lib/android"
+        "/etc/mysql"
+        "/usr/share/php"
+
+        # Haskell runtime
+        "/usr/local/.ghcup"
 
-    sudo rm -rf "$dir" || true
+        # Azure
+        "/opt/az"
+        "/usr/share/az_"*
 
-    printSavedSpace "$before" "$dir"
+        # Environemnt variable set by GitHub Actions
+        "$AGENT_TOOLSDIRECTORY"
+    )
+
+    for dir in "${dirs_to_remove[@]}"; do
+        removeDir "$dir"
+    done
 }
 
 execAndMeasureSpaceChange() {
@@ -79,34 +112,46 @@ execAndMeasureSpaceChange() {
 # Remove large packages
 # REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
 cleanPackages() {
-    sudo apt-get -qq remove -y --fix-missing \
-        '^aspnetcore-.*'       \
-        '^dotnet-.*'           \
-        '^llvm-.*'             \
-        'php.*'                \
-        '^mongodb-.*'          \
-        '^mysql-.*'            \
-        'azure-cli'            \
-        'google-chrome-stable' \
-        'firefox'              \
-        'powershell'           \
-        'mono-devel'           \
-        'libgl1-mesa-dri'      \
-        'google-cloud-sdk'     \
-        'google-cloud-cli'
-
+    sudo apt-get purge -y --autoremove --fix-missing \
+        '.*-icon-theme$'         \
+        '^aspnetcore-.*'        \
+        '^dotnet-.*'            \
+        '^java-*'               \
+        '^libllvm.*'            \
+        '^llvm-.*'              \
+        '^mercurial.*'          \
+        '^mysql-.*'             \
+        '^vim.*'                \
+        '^fonts-.*'             \
+        'azure-cli'             \
+        'buildah'               \
+        'cpp-13'                \
+        'firefox'               \
+        'gcc-12'                \
+        'gcc-13'                \
+        'gcc-14'                \
+        'gcc'                   \
+        'g++-14'                \
+        'gfortran-14'           \
+        'google-chrome-stable'  \
+        'google-cloud-cli'      \
+        'groff-base'            \
+        'kubectl'               \
+        'libgl1-mesa-dri'       \
+        'microsoft-edge-stable' \
+        'php.*'                 \
+        'podman'                \
+        'powershell'            \
+        'skopeo'                \
+        'snapd'                 \
+        'tmux'
+
+    echo "=> apt-get autoremove"
     sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed"
+    echo "=> apt-get clean"
     sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed failed"
 }
 
-# Remove Docker images
-cleanDocker() {
-    echo "Removing the following docker images:"
-    sudo docker image ls
-    echo "Removing docker images..."
-    sudo docker image prune --all --force || true
-}
-
 # Remove Swap storage
 cleanSwap() {
     sudo swapoff -a || true
@@ -121,17 +166,11 @@ AVAILABLE_INITIAL=$(getAvailableSpace)
 printDF "BEFORE CLEAN-UP:"
 echo ""
 
-removeDir /usr/local/lib/android
-removeDir /usr/share/dotnet
-
-# Haskell runtime
-removeDir /opt/ghc
-removeDir /usr/local/.ghcup
-
-execAndMeasureSpaceChange cleanPackages "Large misc. packages"
-execAndMeasureSpaceChange cleanDocker "Docker images"
+execAndMeasureSpaceChange cleanPackages "Unused packages"
 execAndMeasureSpaceChange cleanSwap "Swap storage"
 
+removeUnusedDirectories
+
 # Output saved space statistic
 echo ""
 printDF "AFTER CLEAN-UP:"