Skip to content

Commit a5b0589

Browse files
authored
Rollup 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: rust-lang/infra-team#181 r? `@MarcoIeni` try-job: dist-arm-linux
2 parents da59e77 + 9490297 commit a5b0589

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN sh /scripts/rustbuild-setup.sh
1919
WORKDIR /tmp
2020

2121
COPY scripts/crosstool-ng-build.sh /scripts/
22-
COPY host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
22+
COPY host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
2323
RUN /scripts/crosstool-ng-build.sh
2424

2525
COPY scripts/sccache.sh /scripts/

src/ci/github-actions/jobs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ runners:
4343
os: windows-2022-16core-64gb
4444
<<: *base-job
4545

46-
- &job-aarch64-linux
46+
- &job-linux-8c-aarch64
4747
os: ubuntu-22.04-arm64-8core-32gb
4848

4949
envs:
@@ -139,10 +139,10 @@ auto:
139139
#############################
140140

141141
- image: aarch64-gnu
142-
<<: *job-aarch64-linux
142+
<<: *job-linux-8c-aarch64
143143

144144
- image: aarch64-gnu-debug
145-
<<: *job-aarch64-linux
145+
<<: *job-linux-8c-aarch64
146146

147147
- image: arm-android
148148
<<: *job-linux-4c
@@ -159,7 +159,7 @@ auto:
159159
<<: *job-linux-4c
160160

161161
- image: dist-arm-linux
162-
<<: *job-linux-8c
162+
<<: *job-linux-8c-aarch64
163163

164164
- image: dist-armhf-linux
165165
<<: *job-linux-4c

0 commit comments

Comments
 (0)