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

Fix shards regression #487

Merged
merged 3 commits into from
Apr 23, 2024
Merged

Conversation

Octogonapus
Copy link
Contributor

This PR is my attempt at fixing the shards regression in #486. I added a test that checks all the default triples.

Fixes #486.

@Octogonapus Octogonapus force-pushed the fix_shards_regression branch from fe3d85a to 46f9c46 Compare April 23, 2024 14:19
"x86_64-w64-mingw32"=>"x86_64-w64-windows-gnu",
)

triple2target(triple::String) = get(JLL_ENV_CLANG_TARGETS_MAPPING, triple, "unknown")

function __triplet(p::Platform)
for k in keys(p.tags)
if k != "arch" && k != "os" && k != "libc"
if k != "arch" && k != "os" && k != "libc" && k != "call_abi" && k != "os_version"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

call_abi is needed for armv7l, os_version is needed for freebsd and sometimes darwin

t *= "14"
elseif os(p) == "macos" && arch(p) == "aarch64"
t *= "20"
if os_version(p) === nothing
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know why the user wouldn't specify the version, but here I am just maintaining backward compatibility if they didn't.

@Gnimuc
Copy link
Member

Gnimuc commented Apr 23, 2024

looks like there are download issues on windows platforms.

@testset "get_default_args for all triples" begin
# just testing this does not crash on any default triple
Clang.get_default_args.(Clang.JLLEnvs.JLL_ENV_TRIPLES)
end
Copy link
Member

Choose a reason for hiding this comment

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

this test downloads artifacts for all platforms. running it every time is a bit overkill.

is there a way to somehow cache it?

Copy link
Member

Choose a reason for hiding this comment

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

or maybe we can control it by env variables.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry i didn't realize it did that, i've simplified the test

@Octogonapus
Copy link
Contributor Author

looks like there are download issues on windows platforms.

I'm not sure what that error means, do you know?

@Gnimuc
Copy link
Member

Gnimuc commented Apr 23, 2024

looks like there are download issues on windows platforms.

I'm not sure what that error means, do you know?

no. probably just a mysterious connection issue.

@Gnimuc Gnimuc merged commit 0a0d245 into JuliaInterop:master Apr 23, 2024
11 checks passed
@Gnimuc
Copy link
Member

Gnimuc commented Apr 23, 2024

The new test looks good. Thanks!

@Gnimuc
Copy link
Member

Gnimuc commented Apr 23, 2024

just noticed we just hit 1000 commits ;)

@Octogonapus Octogonapus deleted the fix_shards_regression branch April 23, 2024 17:22
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.

Shards regression in 0.18
2 participants