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 native tests in CircleCI #514

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Conversation

bioball
Copy link
Member

@bioball bioball commented Jun 4, 2024

Fix an issue where the CI job attempts to install the wrong executable when on macOS/aarch64.

Also, adjusts native test definitions in pkl-server to match pkl-core.

Fix an issue where the CI job attempts to install the wrong executable
when on macOS/aarch64.

Also, adjusts native test definitions in pkl-server to match pkl-core.
@bioball bioball marked this pull request as ready for review June 4, 2024 17:23
buildInfo.os.isMacOsX -> {
dependsOn(testMacExecutableAarch64)
if (buildInfo.arch == "aarch64") {
dependsOn(testMacExecutableAmd64)
Copy link
Contributor

Choose a reason for hiding this comment

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

We depend on amd64 if the arch is aarch64? I'm not following the logic here. Shouldn't this be done like linux with separate bodies for each architecture?

Copy link
Member Author

@bioball bioball Jun 5, 2024

Choose a reason for hiding this comment

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

Ah, this logic was flipped around. Will fix.

We cross-build when on macOS/aarch64, thanks to Rosetta. We can't do this on Linux, though.

@bioball bioball merged commit 9cc9816 into apple:main Jun 5, 2024
5 checks passed
@bioball bioball deleted the fix-native-tests branch June 5, 2024 16:05
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.

2 participants