Auto merge of #135774 - marcoieni:dist-arm-linux-free, r=<try>

CI: move dist-arm-linux to a free ARM runner try-job: dist-arm-linux
rust-lang · Jan 20, 2025 · 17a0651 · 17a0651
2 parents b5741a3 + 1c32fe8
commit 17a0651
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...ker/host-x86_64/dist-arm-linux/Dockerfile → ...er/host-aarch64/dist-arm-linux/Dockerfile b/...ker/host-x86_64/dist-arm-linux/Dockerfile → ...er/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/...ist-arm-linux/arm-linux-gnueabi.defconfig → ...ist-arm-linux/arm-linux-gnueabi.defconfig b/...ist-arm-linux/arm-linux-gnueabi.defconfig → ...ist-arm-linux/arm-linux-gnueabi.defconfig
diff --git 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:
@@ -144,7 +146,7 @@ auto:
     <<: *job-linux-4c
 
   - name: dist-arm-linux
-    <<: *job-linux-8c
+    <<: *job-aarch64-linux
 
   - name: dist-armhf-linux
     <<: *job-linux-4c