Skip to content

Build for both apple silicon and apple intel - #6027

Merged
kwvanderlinde merged 2 commits into
RPTools:developfrom
cwisniew:mac-apple-silicon-take-2
Aug 6, 2026
Merged

Build for both apple silicon and apple intel#6027
kwvanderlinde merged 2 commits into
RPTools:developfrom
cwisniew:mac-apple-silicon-take-2

Conversation

@cwisniew

@cwisniew cwisniew commented Aug 6, 2026

Copy link
Copy Markdown
Member

Identify the Bug or Feature request

Resolves #5987

Description of the Change

Adds native Apple Silicon (ARM64/macOS) builds to the CI pipeline, producing architecture-specific artifacts alongside the existing Intel builds. No Rosetta emulation needed on Apple Silicon Macs.

Possible Drawbacks

Should be none

Documentation Notes

CI Workflows

  • .github/workflows/publish.yml — Added macos-15 (ARM64 native) runner to the release matrix alongside macos-15-intel (X86_64). macOS artifacts are now named with -mac-intel and -mac-apple-silicon suffixes respectively (DMG, PKG, and .app.zip).
  • .github/workflows/verify-build.yml — Added macos-15 runner to the build verification matrix.

Gradle Build

  • build.gradle — The macOS jpackage target platform now conditionally downloads the aarch64 Temurin JDK (OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz) when building on Apple Silicon, instead of the x64 JDK.
  • clientserver/build.gradle — Added a macos-aarch64 classifier branch for the WebRTC native library (webrtc-java 0.11.0 already publishes this classifier).
    Native Dependency Compatibility
    All existing native dependencies already support Apple Silicon natively — no version bumps were needed:
  • LibGDX 1.13.5 — natives-desktop includes libgdxarm64.dylib (for when we add back in)
  • JOGL 2.5.0 — ships universal binaries (natives-macosx-universal) (for when we add back in)
  • Zstd-JNI — auto-detects osx-aarch64
  • WebP ImageIO — supports ARM64
  • JavaFX 22 — plugin auto-resolves mac-aarch64
  • JAI ImageIO — pure Java, no native code

Release Notes

Artifact naming (for future releases after this is applied)

Artifact Architecture
MapTool-1.2.3-mac-intel.dmg Intel (x86_64)
MapTool-1.2.3-mac-intel.pkg Intel (x86_64)
MapTool-1.2.3-mac-intel.app.zip Intel (x86_64)
MapTool-1.2.3-mac-apple-silicon.dmg Apple Silicon (ARM64)
MapTool-1.2.3-mac-apple-silicon.pkg Apple Silicon (ARM64)
MapTool-1.2.3-mac-apple-silicon.app.zip Apple Silicon (ARM64)

This change is Reviewable

@github-actions github-actions Bot added the feature Adding functionality that adds value label Aug 6, 2026
@cwisniew
cwisniew marked this pull request as draft August 6, 2026 13:05
@cwisniew
cwisniew marked this pull request as ready for review August 6, 2026 13:50
@cwisniew
cwisniew requested a review from kwvanderlinde August 6, 2026 13:50
@cwisniew cwisniew added build-configuration and removed feature Adding functionality that adds value labels Aug 6, 2026
@kwvanderlinde
kwvanderlinde added this pull request to the merge queue Aug 6, 2026
Merged via the queue into RPTools:develop with commit 92370a3 Aug 6, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature]: Update build to create native apple silicon builds

2 participants