Skip to content

Commit

Permalink
Auto merge of #133902 - Kobzol:ci-dist-arm-runner, r=MarcoIeni
Browse files Browse the repository at this point in the history
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: rust-lang/infra-team#181

r? `@MarcoIeni`

try-job: dist-arm-linux
  • Loading branch information
bors committed Dec 10, 2024
2 parents ff7906b + 9490297 commit b597d2a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 4 additions & 4 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b597d2a

Please sign in to comment.