diff options
| author | bors <bors@rust-lang.org> | 2024-12-21 15:19:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-21 15:19:22 +0000 |
| commit | 387b245664a81f58260a6b565aa0b2fdf19752fb (patch) | |
| tree | 2bb276866e5303770540cdd8a67df512428022f4 | |
| parent | 9bd5f3387dd1e24e3493fd53c2f80e5991a155b6 (diff) | |
| parent | 69a6c9c36503e4d24f50d6eac0efbafab93d44f2 (diff) | |
| download | rust-387b245664a81f58260a6b565aa0b2fdf19752fb.tar.gz rust-387b245664a81f58260a6b565aa0b2fdf19752fb.zip | |
Auto merge of #134614 - Kobzol:revert-dist-arm, r=onur-ozkan
Revert "Auto merge of #133902 - Kobzol:ci-dist-arm-runner, r=MarcoIeni" Reverts https://github.com/rust-lang/rust/pull/133902 Context: https://github.com/rust-lang/rust/issues/134612#issuecomment-2558111888
| -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 |