Skip to content

feat(ci): add macos universal2 build#2628

Merged
shamardy merged 14 commits intostagingfrom
ci-add-universal-macos
Oct 7, 2025
Merged

feat(ci): add macos universal2 build#2628
shamardy merged 14 commits intostagingfrom
ci-add-universal-macos

Conversation

@dimxy
Copy link
Copy Markdown
Collaborator

@dimxy dimxy commented Sep 25, 2025

Implements this requirement:
#2627 (following this GLEECBTC/gleec-wallet#3154)

@dimxy dimxy requested review from DeckerSU and shamardy September 25, 2025 15:30
@dimxy dimxy self-assigned this Sep 25, 2025
@dimxy
Copy link
Copy Markdown
Collaborator Author

dimxy commented Sep 25, 2025

This PR makes only fat executable. No fat dylib is created because apparently we do not produce dylib for the arm platform. (Do we need it though?)
@DeckerSU @shamardy

@dimxy dimxy marked this pull request as ready for review September 25, 2025 15:37
@DeckerSU
Copy link
Copy Markdown

DeckerSU commented Sep 25, 2025

This PR makes only fat executable. No fat dylib is created because apparently we do not produce dylib for the arm platform. (Do we need it though?) @DeckerSU @shamardy

Yes, it looks very good at first glance. I can confirm that it produces and uploads a binary with both architectures inside:

./kdf: Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit x86_64 executable, flags:<NOUNDEFS|DYLDLINK|TWOLEVEL|PIE|HAS_TLV_DESCRIPTORS>] [arm64]

For me, it looks good (LGTM). As I mentioned in GLEECBTC/gleec-wallet#3154, I plan to make releases for both the kdf binary and the static library libkdflib.a. So the GitHub Release section will contain 2 archives for macOS, like libkdf-macos-universal2-d6e2324.zip and kdf-macos-universal2-d6e2324.zip.

For dev builds, I am not sure whether anyone needs static libs or not. So, I approve this PR as LGTM, but if other team members or developers consider .a or .dylib important for dev builds, then they should be added in this PR. If not, then it is fine as it is now.

@dimxy
Copy link
Copy Markdown
Collaborator Author

dimxy commented Sep 25, 2025

I guess I need add the same job into yet another workflow .github/workflows/release-build.yml (which actually runs when we merge into the main branch)

mariocynicys
mariocynicys previously approved these changes Sep 26, 2025
View reviewed changes
Copy link
Copy Markdown
Collaborator

@mariocynicys mariocynicys left a comment

Choose a reason for hiding this comment

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

LGTM!

@shamardy shamardy changed the base branch from dev to staging October 7, 2025 02:21
@shamardy shamardy dismissed mariocynicys’s stale review October 7, 2025 02:21

The base branch was changed.

@shamardy shamardy changed the base branch from staging to dev October 7, 2025 02:37
@shamardy shamardy force-pushed the ci-add-universal-macos branch from 269fbbb to 3023cc6 Compare October 7, 2025 02:46
@shamardy shamardy changed the base branch from dev to staging October 7, 2025 02:46
@shamardy shamardy merged commit dc9fd12 into staging Oct 7, 2025
19 of 26 checks passed
@shamardy shamardy deleted the ci-add-universal-macos branch October 7, 2025 03:55
shamardy added a commit that referenced this pull request Oct 7, 2025
@shamardy
Merge pull request #2636 from KomodoPlatform/chore/2.5.2-macos-univer…
a8cbfb3 
…sal-staging-to-dev

chore(release): propagate #2628 (staging→dev)
@shamardy shamardy mentioned this pull request Oct 7, 2025
Merged
dimxy pushed a commit that referenced this pull request Oct 8, 2025
Merge branch 'dev' into fix-zcoin-withdrawal-locked-notes
590a0fb 
* dev:
  fix(TPU): correct dexfee in check balance to prevent swap failures (#2600)
  fix(tests): fix/remove kmd rewards failing test (#2633)
  chore(ci): bump CI container image to debian bullseye-slim to match dev (#2641)
  chore(release): add changelog entries for v2.5.2-beta (#2639)
  chore(release): bump mm2 version to 2.5.2-beta (#2638)
  feat(ci): add macos universal2 build (#2628)
  fix(metrics): remove memory_db size metric (#2632)
  chore(rust 1.90): make CI clippy/fmt pass
  Revert "fix(ordermatch): ignore loop-back; clear on null root; reject stale keep-alives (#2580)"
  Revert "fix(orderbook): validate roots before commit (#2605)"
dimxy pushed a commit that referenced this pull request Oct 9, 2025
Merge branch 'dev' into refactor-TPU-fee-calc
3ab7dc0 
* dev:
  fix(TPU): correct dexfee in check balance to prevent swap failures (#2600)
  fix(tests): fix/remove kmd rewards failing test (#2633)
  chore(ci): bump CI container image to debian bullseye-slim to match dev (#2641)
  chore(release): add changelog entries for v2.5.2-beta (#2639)
  chore(release): bump mm2 version to 2.5.2-beta (#2638)
  feat(ci): add macos universal2 build (#2628)
  fix(metrics): remove memory_db size metric (#2632)
  fix(zcoin): exact-anchor witnesses in wasm get_spendable_notes (#2629)
  fix(evm-swapv2): no mempool inclusion required for maker payment validation (#2618)
  chore(rust 1.90): make CI clippy/fmt pass
  Revert "fix(ordermatch): ignore loop-back; clear on null root; reject stale keep-alives (#2580)"
  Revert "fix(orderbook): validate roots before commit (#2605)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shamardy shamardy shamardy approved these changes

@mariocynicys mariocynicys mariocynicys left review comments

@DeckerSU DeckerSU Awaiting requested review from DeckerSU

Assignees

@dimxy dimxy

Labels

improvement: CI status: pending review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dimxy @DeckerSU @shamardy @mariocynicys