Skip to content

Update dependancies and change build for apple silicon #5988

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.

Sign up for GitHub

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

Open
cwisniew wants to merge 1 commit into
base: develop
Choose a base branch
from
+45 −17
Open

Update dependancies and change build for apple silicon #5988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,29 @@ on:
release:
types:
- published
jobs:
jobs:

@kwvanderlinde kwvanderlinde Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Inadvertent indentation?

build:
permissions:
contents: write
name: ${{ matrix.os }} w/JDK ${{ matrix.java }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-15-intel]
java: [ '21' ]
distribution: ['temurin']
include:
- os: windows-latest
java: '21'
distribution: 'temurin'
- os: ubuntu-latest
java: '21'
distribution: 'temurin'
- os: macos-15-intel
arch: intel
java: '21'
distribution: 'temurin'
- os: macos-15
arch: apple-silicon
java: '21'
distribution: 'temurin'

@kwvanderlinde kwvanderlinde Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Any reason not to just tack on macos-15 to the existing os list?

fail-fast: false
steps:
# ____ _ __ __ ___ ____ __
Expand Down Expand Up @@ -190,9 +202,9 @@ jobs:
if: startsWith(matrix.os, 'macos')
run: |
mkdir releases/renamed/
cp releases/MapTool*.dmg releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
cp releases/MapTool*.pkg releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
cp releases/MapTool*-mac.app.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
cp releases/MapTool*.dmg releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
cp releases/MapTool*.pkg releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
cp releases/MapTool*-mac.app.zip releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
continue-on-error: true
- name: Upload Mac DMG Release Asset
id: upload-release-asset-dmg
Expand All @@ -202,8 +214,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.dmg
asset_name: MapTool-${{ github.event.release.tag_name }}.dmg
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.dmg
asset_content_type: application/octet-stream
- name: Upload Mac PKG Release Asset
id: upload-release-asset-pkg
Expand All @@ -213,8 +225,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}.pkg
asset_name: MapTool-${{ github.event.release.tag_name }}.pkg
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.pkg
asset_content_type: application/octet-stream
- name: Upload Mac Image Release Asset
id: upload-release-asset-mac-image
Expand All @@ -224,6 +236,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac.app.zip
asset_name: MapTool-${{ github.event.release.tag_name }}-mac.app.zip
asset_path: releases/renamed/MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
asset_name: MapTool-${{ github.event.release.tag_name }}-mac-${{ matrix.arch }}.app.zip
asset_content_type: application/octet-stream
16 changes: 13 additions & 3 deletions .github/workflows/verify-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,19 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-15-intel]
java: [ '21' ]
distribution: [ 'temurin']
include:
- os: windows-latest
java: '21'
distribution: 'temurin'
- os: ubuntu-latest
java: '21'
distribution: 'temurin'
- os: macos-15-intel
java: '21'
distribution: 'temurin'
- os: macos-15
java: '21'
distribution: 'temurin'
fail-fast: false
steps:
- name: Git checkout
Expand Down
6 changes: 5 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,11 @@ runtime {
'--mac-package-name', project.name + developerRelease
]
targetPlatform('mac') {
jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz')
if (osdetector.arch == 'aarch64') {
jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz')
} else {
jdkHome = jdkDownload('https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz')
}
jvmArgs += [ '-Xdock:name=' + project.name + developerRelease ]
}
}
Expand Down
2 changes: 2 additions & 0 deletions clientserver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ dependencies {
implementation(libs.webrtc)
if (osdetector.os.is('windows'))
implementation(variantOf(libs.webrtc) { classifier('windows-x86_64')})
else if (osdetector.os.is('osx') && osdetector.arch == 'aarch64')
implementation(variantOf(libs.webrtc) { classifier('macos-aarch64')})
else if (osdetector.os.is('osx'))
implementation(variantOf(libs.webrtc) { classifier('macos-x86_64')})
else if (osdetector.os.is('linux'))
Expand Down
Loading