1
Fork 0

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

This reverts commit b597d2a099, reversing
changes made to ff7906bfe1.
This commit is contained in:
Jakub Beránek 2024-12-21 13:51:17 +01:00
parent 54dcff104b
commit 69a6c9c365
No known key found for this signature in database
GPG key ID: 909CD0D26483516B
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-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
COPY host-x86_64/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-linux-8c-aarch64
- &job-aarch64-linux
os: ubuntu-22.04-arm64-8core-32gb
envs:
@ -124,10 +124,10 @@ auto:
#############################
- image: aarch64-gnu
<<: *job-linux-8c-aarch64
<<: *job-aarch64-linux
- image: aarch64-gnu-debug
<<: *job-linux-8c-aarch64
<<: *job-aarch64-linux
- image: arm-android
<<: *job-linux-4c
@ -144,7 +144,7 @@ auto:
<<: *job-linux-4c
- image: dist-arm-linux
<<: *job-linux-8c-aarch64
<<: *job-linux-8c
- image: dist-armhf-linux
<<: *job-linux-4c