about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <jakub.beranek@vsb.cz>2024-12-05 10:33:49 +0100
committerJakub Beránek <jakub.beranek@vsb.cz>2024-12-06 15:31:07 +0100
commita5855516f44e494e0e21af3fb43a25ba04e75f03 (patch)
tree5fbff13e0f1814064d652f2dc6b0e58bb4268a4f
parent5a0a5e6db9727917ce3e36950dae92696bc17079 (diff)
downloadrust-a5855516f44e494e0e21af3fb43a25ba04e75f03.tar.gz
rust-a5855516f44e494e0e21af3fb43a25ba04e75f03.zip
CI: move `dist-arm-linux` to an ARM runner
-rw-r--r--src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile (renamed from src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile)2
-rw-r--r--src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig (renamed from src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig)0
-rw-r--r--src/ci/github-actions/jobs.yml2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile
index 420c42bc9d8..4a749473004 100644
--- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
+++ b/src/ci/docker/host-aarch64/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-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
+COPY host-aarch64/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-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig b/src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig
index e7afdbe9d4d..e7afdbe9d4d 100644
--- a/src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig
+++ b/src/ci/docker/host-aarch64/dist-arm-linux/arm-linux-gnueabi.defconfig
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 2ea37c168dd..897fdb1df4e 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -143,7 +143,7 @@ auto:
     <<: *job-linux-4c
 
   - image: dist-arm-linux
-    <<: *job-linux-8c
+    <<: *job-aarch64-linux
 
   - image: dist-armhf-linux
     <<: *job-linux-4c