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

Take into account architecture when selecting linux artifact #59

Merged
merged 4 commits into from
Sep 27, 2022

Conversation

JohnnyMorganz
Copy link
Contributor

StyLua recently started producing linux-aarch64 builds. Foreman does not correctly take into account the architecture on linux, and selects the linux-aarch64 build when linux-x86_64 should be used. This causes GitHub Actions CI to fail.

We fix this by preferring a more explicit name in platform keywords for linux (depending on arch), and falling back to the generic one if nothing is found

Copy link
Contributor

@oltrep oltrep left a comment

Choose a reason for hiding this comment

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

Thanks again for the contribution and also for writing a test 👍

Comment on lines +17 to +21
#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
static PLATFORM_KEYWORDS: &[&str] = &["linux-x86_64", "linux"];

#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
static PLATFORM_KEYWORDS: &[&str] = &["linux-arm64", "linux-aarch64", "linux"];
Copy link
Contributor

Choose a reason for hiding this comment

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

This will drop support for 32bit arch on linux, maybe it's preferable to add a gated declaration for those?

Copy link
Contributor

@ZoteTheMighty ZoteTheMighty left a comment

Choose a reason for hiding this comment

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

LGTM!

@JohnnyMorganz
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@github-actions
Copy link

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@ZoteTheMighty ZoteTheMighty merged commit 0d7ec34 into Roblox:master Sep 27, 2022
@JohnnyMorganz JohnnyMorganz deleted the fix-linux-selector branch September 27, 2022 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants