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

Build universal binary instead of architecture dependent #995

Merged
merged 4 commits into from
Jan 16, 2025

Conversation

amalchuk
Copy link
Contributor

@amalchuk amalchuk commented Jan 13, 2025

Added feature for building a universal binary (both arm64 and x86_64).

@amalchuk amalchuk force-pushed the feature/universal-binary branch from ae55057 to 744b5db Compare January 13, 2025 17:19
@amalchuk
Copy link
Contributor Author

Unfortunately, got an error in SwiftFormat, same as nicklockwood/SwiftFormat#1645

error: duplicate key found: 'ID(moduleName: "CommandLineTool", packageIdentity: swiftformat, buildTriple: PackageGraph.BuildTriple.destination)'

@amalchuk amalchuk force-pushed the feature/universal-binary branch 3 times, most recently from a51ea6a to 9723fdd Compare January 13, 2025 18:23
@amalchuk amalchuk force-pushed the feature/universal-binary branch from 9723fdd to afdf283 Compare January 13, 2025 18:25
@amalchuk amalchuk marked this pull request as ready for review January 13, 2025 18:34
@edigaryev
Copy link
Collaborator

Unfortunately, got an error in SwiftFormat, same as nicklockwood/SwiftFormat#1645

I think we can just drop SwiftFormat from Tart's dependencies and install it from HomeBrew in .cirrus.yml to avoid the workaround.

/cc @fkorotkov

Copy link
Contributor

@fkorotkov fkorotkov left a comment

Choose a reason for hiding this comment

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

@amalchuk left couple comments. Thank you for working on this!

@edigaryev agreed on the SwiftFormat installation.

.goreleaser.yml Outdated Show resolved Hide resolved
.goreleaser.yml Outdated Show resolved Hide resolved
@amalchuk amalchuk marked this pull request as draft January 16, 2025 00:14
@amalchuk
Copy link
Contributor Author

I think we can just drop SwiftFormat from Tart's dependencies and install it from HomeBrew in .cirrus.yml to avoid the workaround.

If build hooks will not be changed, we can stay using swiftformat as dependency as before. I have no great knowledge of how goreleaser is working, so I hoped to swift package builder.

@fkorotkov Please, do review of changes and test, how archives are processing by the goreleaser-pro. I have not any ideas how to test it myself.

@amalchuk amalchuk marked this pull request as ready for review January 16, 2025 00:33
@amalchuk amalchuk requested a review from fkorotkov January 16, 2025 00:35
Copy link
Contributor

@fkorotkov fkorotkov left a comment

Choose a reason for hiding this comment

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

Thank you! I guess we'll know how it all goes on the next release shortly 😅

@fkorotkov fkorotkov merged commit 4cf68fc into cirruslabs:main Jan 16, 2025
5 checks passed
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