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

Change OSX CD to build a universal binary #190

Merged
merged 2 commits into from
Oct 27, 2024

Conversation

dmalec
Copy link
Collaborator

@dmalec dmalec commented Oct 19, 2024

This MR follows up on #186 to address the CD build for versions of OSX prior to 11. CD now builds two version of wxWidgets and two versions of Logo for OSX, using matrix builds to target x86 and ARM. It then adds a stage which takes the individual platform builds of OSX Logo and combines them into a universal binary build.

Caveats

Size - this does result in a larger application file; I think there may be value in checking what can be disabled in the wxWidgets build without impacting the parts of wxWidgets used by UCB Logo.

Duplicate build logic - I'd like to not replicate the portion of the Makefile which builds the DMG into the CD file; but, I ran into some challenges in solving that and would like to mull some more. My thinking is that, in the meantime, this change will restore CD to working for the platforms it was previously working for. Understood if folks would like to hold off until the two places can be unified appropriately.

Testing

Downloaded the universal binary produced by the CD pipeline and was able to run it on both platforms. Checked via command line that OSX sees this as a universal binary:

file /Volumes/UCBLogo/UCBLogo.app/Contents/MacOS/UCBLogo 
/Volumes/UCBLogo/UCBLogo.app/Contents/MacOS/UCBLogo: Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64]
/Volumes/UCBLogo/UCBLogo.app/Contents/MacOS/UCBLogo (for architecture x86_64):	Mach-O 64-bit executable x86_64
/Volumes/UCBLogo/UCBLogo.app/Contents/MacOS/UCBLogo (for architecture arm64):	Mach-O 64-bit executable arm64

Test Environments

  • OSX Catalina (10.15.7) running on Intel Core i7
  • OSX Ventura (13.6.6) running on Apple M2

Copy link
Owner

@jrincayc jrincayc left a comment

Choose a reason for hiding this comment

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

Reviewed and approve.

@jrincayc jrincayc merged commit dd8b5cd into jrincayc:master Oct 27, 2024
2 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.

2 participants