From a5855516f44e494e0e21af3fb43a25ba04e75f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 5 Dec 2024 10:33:49 +0100 Subject: [PATCH 1/2] CI: move `dist-arm-linux` to an ARM runner --- .../{host-x86_64 => host-aarch64}/dist-arm-linux/Dockerfile | 2 +- .../dist-arm-linux/arm-linux-gnueabi.defconfig | 0 src/ci/github-actions/jobs.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/ci/docker/{host-x86_64 => host-aarch64}/dist-arm-linux/Dockerfile (94%) rename src/ci/docker/{host-x86_64 => host-aarch64}/dist-arm-linux/arm-linux-gnueabi.defconfig (100%) diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile similarity index 94% rename from src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile rename to src/ci/docker/host-aarch64/dist-arm-linux/Dockerfile index 420c42bc9d807..4a749473004e2 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 similarity index 100% rename from src/ci/docker/host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig rename to 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 2ea37c168dd3c..897fdb1df4e50 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 From 949029753872fb411adc70a38642e33cdb9636cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 5 Dec 2024 12:41:22 +0100 Subject: [PATCH 2/2] Rename the ARM runner YAML anchor To make it more consistent with the rest of the anchors. --- src/ci/github-actions/jobs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 897fdb1df4e50..5c3d5c5e107d7 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-aarch64-linux + - &job-linux-8c-aarch64 os: ubuntu-22.04-arm64-8core-32gb envs: @@ -123,10 +123,10 @@ auto: ############################# - image: aarch64-gnu - <<: *job-aarch64-linux + <<: *job-linux-8c-aarch64 - image: aarch64-gnu-debug - <<: *job-aarch64-linux + <<: *job-linux-8c-aarch64 - image: arm-android <<: *job-linux-4c @@ -143,7 +143,7 @@ auto: <<: *job-linux-4c - image: dist-arm-linux - <<: *job-aarch64-linux + <<: *job-linux-8c-aarch64 - image: dist-armhf-linux <<: *job-linux-4c