Skip to content

Commit 387b245

Browse files
committed
Auto merge of #134614 - Kobzol:revert-dist-arm, r=onur-ozkan
Revert "Auto merge of #133902 - Kobzol:ci-dist-arm-runner, r=MarcoIeni" Reverts #133902 Context: #134612 (comment)
2 parents 9bd5f33 + 69a6c9c commit 387b245

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile src/ci/docker/host-x86_64/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-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
22+
COPY host-x86_64/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-linux-8c-aarch64
46+
- &job-aarch64-linux
4747
os: ubuntu-22.04-arm64-8core-32gb
4848

4949
envs:
@@ -124,10 +124,10 @@ auto:
124124
#############################
125125

126126
- image: aarch64-gnu
127-
<<: *job-linux-8c-aarch64
127+
<<: *job-aarch64-linux
128128

129129
- image: aarch64-gnu-debug
130-
<<: *job-linux-8c-aarch64
130+
<<: *job-aarch64-linux
131131

132132
- image: arm-android
133133
<<: *job-linux-4c
@@ -144,7 +144,7 @@ auto:
144144
<<: *job-linux-4c
145145

146146
- image: dist-arm-linux
147-
<<: *job-linux-8c-aarch64
147+
<<: *job-linux-8c
148148

149149
- image: dist-armhf-linux
150150
<<: *job-linux-4c

0 commit comments

Comments
 (0)