diff options
| author | bors <bors@rust-lang.org> | 2024-12-10 07:44:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-10 07:44:46 +0000 |
| commit | b597d2a099a1b5b79acef05175a9ac847047f8a1 (patch) | |
| tree | 75e1448789d579ada3b9e5374e9398770a676d20 | |
| parent | ff7906bfe1ed264bf9c4d3abe1940e357b7e61dd (diff) | |
| parent | 949029753872fb411adc70a38642e33cdb9636cd (diff) | |
| download | rust-b597d2a099a1b5b79acef05175a9ac847047f8a1.tar.gz rust-b597d2a099a1b5b79acef05175a9ac847047f8a1.zip | |
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
| -rw-r--r-- | src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile (renamed from src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile) | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig (renamed from src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig) | 0 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile index 420c42bc9d8..4a749473004 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 index e7afdbe9d4d..e7afdbe9d4d 100644 --- 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 diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 288b133f0da..959a9580e60 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -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 |