Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: move dist-arm-linux to an ARM runner #133902

Merged
merged 2 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it sounds like this is still a normal cross-compilation job, it now just happens to use an aarch64 host in CI. Can we drop this host-aarch64/host-x86_64 distinction for jobs where it is not relevant? Otherwise it will not be possible to test this image locally (on x86_64) anymore.

Copy link
Contributor

@nikic nikic Dec 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically, as far as I can tell, there is no relation at all here between the fact that this is dist-arm-linux and we're running on ARM. You could do exactly the same move for all/most other crosstool-ng based jobs, if the ARM runners are cheaper for you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. But based on your comment from the other PR, moving to a native build would raise the minimum glibc version, right? Since this already used crosstool before, we could make use of it to keep glibc lower.

RUN /scripts/crosstool-ng-build.sh

COPY scripts/sccache.sh /scripts/
Expand Down
8 changes: 4 additions & 4 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -143,7 +143,7 @@ auto:
<<: *job-linux-4c

- image: dist-arm-linux
<<: *job-linux-8c
<<: *job-linux-8c-aarch64

- image: dist-armhf-linux
<<: *job-linux-4c
Expand Down
Loading