diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2024-12-21 13:51:17 +0100 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2024-12-21 13:51:17 +0100 |
| commit | 69a6c9c36503e4d24f50d6eac0efbafab93d44f2 (patch) | |
| tree | 4fb8789bf161e079e305e64b29e6c31d357cb89b | |
| parent | 54dcff104b0acf01716a94429717d364fe43f90d (diff) | |
| download | rust-69a6c9c36503e4d24f50d6eac0efbafab93d44f2.tar.gz rust-69a6c9c36503e4d24f50d6eac0efbafab93d44f2.zip | |
Revert "Auto merge of #133902 - Kobzol:ci-dist-arm-runner, r=MarcoIeni"
This reverts commit b597d2a099a1b5b79acef05175a9ac847047f8a1, reversing changes made to ff7906bfe1ed264bf9c4d3abe1940e357b7e61dd.
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile (renamed from src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile) | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig (renamed from src/ci/docker/host-aarch64/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-aarch64/dist-arm-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile index 4a749473004..420c42bc9d8 100644 --- a/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/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-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/ diff --git a/src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig b/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig index e7afdbe9d4d..e7afdbe9d4d 100644 --- a/src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig +++ b/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 94033d79af9..876a7793592 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-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 |