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.

Sign up for GitHub

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

Jump to bottom

Fix support for Amazon Linux 2 x86_64, add EndToEndTests for all RHEL distributions #195

Merged
merged 8 commits into from
Mar 12, 2025
Merged

Fix support for Amazon Linux 2 x86_64, add EndToEndTests for all RHEL distributions #195

merged 8 commits into from
Mar 12, 2025

Conversation

xtremekforever
Copy link
Contributor

@xtremekforever xtremekforever commented Mar 7, 2025 •
edited
Loading

This fixes the final issue we saw with #138 where there was an error generating an amazonlinux2 Swift SDK for x86_64. This was fixed by removing 32-bit libraries from the sysroot imported from the container for RHEL-based distributions.

To test this, I've added EndToEndTests for amazonlinux2 and fedora39 on top of the existing RHEL UBI9 tests. All of these depend on pulling from containers to test:

    2.1 GiB [#################] /fedora39_aarch64_6.0.3-RELEASE_with-docker.artifactbundle
    2.0 GiB [################ ] /fedora39_x86_64_6.0.3-RELEASE_with-docker.artifactbundle
    2.0 GiB [################ ] /amazonlinux2_aarch64_6.0.3-RELEASE_with-docker.artifactbundle
    1.9 GiB [###############  ] /amazonlinux2_x86_64_6.0.3-RELEASE_with-docker.artifactbundle
    1.9 GiB [###############  ] /rhel_ubi9_x86_64_6.0.3-RELEASE_with-docker.artifactbundle
    1.9 GiB [###############  ] /rhel_ubi9_aarch64_6.0.3-RELEASE_with-docker.artifactbundle
    1.8 GiB [###############  ] /fedora39_x86_64_5.10.1-RELEASE_with-docker.artifactbundle
    1.8 GiB [###############  ] /fedora39_aarch64_5.10.1-RELEASE_with-docker.artifactbundle
    1.8 GiB [##############   ] /amazonlinux2_aarch64_5.10.1-RELEASE_with-docker.artifactbundle
    1.8 GiB [##############   ] /amazonlinux2_x86_64_5.10.1-RELEASE_with-docker.artifactbundle
    1.7 GiB [##############   ] /rhel_ubi9_x86_64_5.10.1-RELEASE_with-docker.artifactbundle
    1.7 GiB [##############   ] /rhel_ubi9_aarch64_5.10.1-RELEASE_with-docker.artifactbundle
    1.7 GiB [##############   ] /amazonlinux2_aarch64_5.9.2-RELEASE_with-docker.artifactbundle
    1.7 GiB [#############    ] /amazonlinux2_x86_64_5.9.2-RELEASE_with-docker.artifactbundle
    1.7 GiB [#############    ] /rhel_ubi9_x86_64_5.9.2-RELEASE_with-docker.artifactbundle
    1.7 GiB [#############    ] /rhel_ubi9_aarch64_5.9.2-RELEASE_with-docker.artifactbundle

All of these Swift SDKs take 30GB of disk space.

euanh
euanh requested changes Mar 7, 2025
View reviewed changes
Copy link
Contributor

@euanh euanh left a comment

Choose a reason for hiding this comment

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

Could you please separate this into two pull requests?

  • One PR for the AmazonLinux 32-bit library changes
  • One PR for the change of --host-toolchain default

@xtremekforever
Remove 32-bit libraries from RHEL sysroots built from containers
eed7c21 
 - These are not needed, and the amazonlinux2 ones have broken symlinks that cause failures to generate the Swift SDK.
@xtremekforever
Update EndToEndTests to DRY out code a bit, add tests for amazonlinux…
45a0614 
…2 and fedora39
@xtremekforever xtremekforever force-pushed the #138-amazon-linux-and-general-fixes branch from d7aa47d to 45a0614 Compare March 7, 2025 13:01
@xtremekforever xtremekforever changed the title Fix support for Amazon Linux 2 x86_64, macOS host-toolchain default, documentation, EndToEndTests Fix support for Amazon Linux 2 x86_64, add EndToEndTests for all RHEL distributions Mar 7, 2025
@xtremekforever
Copy link
Contributor Author

I split out the --host-toolchain default change here: #196

@MaxDesiatov
Copy link
Contributor

@swift-ci test

@euanh euanh self-requested a review March 7, 2025 13:27
@xtremekforever
Restore skipSlow() calls in each test case for configurability
ca2c787 
 - Some tests may not be skipped in the future
@MaxDesiatov
Copy link
Contributor

@swift-ci test

@euanh euanh self-requested a review March 10, 2025 12:18
@MaxDesiatov
Copy link
Contributor

@swift-ci test

@MaxDesiatov MaxDesiatov merged commit 330c3f2 into swiftlang:main Mar 12, 2025
19 checks passed
@xtremekforever xtremekforever deleted the #138-amazon-linux-and-general-fixes branch March 12, 2025 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxDesiatov MaxDesiatov MaxDesiatov approved these changes

@euanh euanh euanh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xtremekforever @MaxDesiatov @euanh