Auto merge of #133902 - Kobzol:ci-dist-arm-runner, r=MarcoIeni

CI: move `dist-arm-linux` to an ARM runner

First, I want to test whether we could actually move this to a free runner, vs moving to the 8-core ARM runner.

Fixes: https://github.com/rust-lang/infra-team/issues/181

r? `@MarcoIeni`

try-job: dist-arm-linux
This commit is contained in:
bors 2024-12-10 07:44:46 +00:00
commit b597d2a099
3 changed files with 5 additions and 5 deletions

View file

@ -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/

View file

@ -43,7 +43,7 @@ runners:
os: windows-2022-16core-64gb
<<: *base-job
- &job-aarch64-linux
- &job-linux-8c-aarch64
os: ubuntu-22.04-arm64-8core-32gb
envs:
@ -139,10 +139,10 @@ auto:
#############################
- image: aarch64-gnu
<<: *job-aarch64-linux
<<: *job-linux-8c-aarch64
- image: aarch64-gnu-debug
<<: *job-aarch64-linux
<<: *job-linux-8c-aarch64
- image: arm-android
<<: *job-linux-4c
@ -159,7 +159,7 @@ auto:
<<: *job-linux-4c
- image: dist-arm-linux
<<: *job-linux-8c
<<: *job-linux-8c-aarch64
- image: dist-armhf-linux
<<: *job-linux-4c