From 443206e89e05b129e4c319cf4202ada96172dae2 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:40:22 +0100
Subject: [PATCH 1/2] CI: move dist-arm-linux to a free ARM runner

---
 .../{host-x86_64 => host-aarch64}/dist-arm-linux/Dockerfile     | 2 +-
 .../dist-arm-linux/arm-linux-gnueabi.defconfig                  | 0
 src/ci/github-actions/jobs.yml                                  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/ci/docker/{host-x86_64 => host-aarch64}/dist-arm-linux/Dockerfile (94%)
 rename src/ci/docker/{host-x86_64 => host-aarch64}/dist-arm-linux/arm-linux-gnueabi.defconfig (100%)

diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile
similarity index 94%
rename from src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
rename to src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile
index 420c42bc9d807..4a749473004e2 100644
--- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
+++ b/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile
@@ -19,7 +19,7 @@ RUN sh /scripts/rustbuild-setup.sh
 WORKDIR /tmp
 
 COPY scripts/crosstool-ng-build.sh /scripts/
-COPY host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
+COPY host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
 RUN /scripts/crosstool-ng-build.sh
 
 COPY scripts/sccache.sh /scripts/
diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig b/src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig
similarity index 100%
rename from src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig
rename to src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 799ea3e9ad2df..1c15ad38a0fbb 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -144,7 +144,7 @@ auto:
     <<: *job-linux-4c
 
   - name: dist-arm-linux
-    <<: *job-linux-8c
+    <<: *job-aarch64-linux
 
   - name: dist-armhf-linux
     <<: *job-linux-4c

From 1c32fe8befd49e37dd294abf2a630d0813f57ba9 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:26:53 +0100
Subject: [PATCH 2/2] free disk space

---
 src/ci/github-actions/jobs.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 1c15ad38a0fbb..cc5efd2154cad 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -44,6 +44,8 @@ runners:
     <<: *base-job
 
   - &job-aarch64-linux
+    # Free some disk space to avoid running out of space during the build.
+    free_disk: true
     os: ubuntu-22.04-arm
 
 envs: