diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c00c353..22c8e2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,10 +80,10 @@ jobs: release_artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe" build_input: build_windows - name: mac - os: macos-13 + os: macos-14 node: 18 python: "3.11" - release_artifacts: "dist/*-mac.dmg" + release_artifacts: "dist/*-mac-*.dmg" build_input: build_mac - name: linux os: ubuntu-latest @@ -173,7 +173,7 @@ jobs: mv dist/*.whl python-dist/ rm -rf dist - - name: Build Electron App + - name: Build Electron App (Universal) if: | github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true) diff --git a/package.json b/package.json index 9f6b59b..0da9252 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,9 @@ "electron-postinstall": "electron-builder install-app-deps", "electron": "npm run electron-postinstall && npm run build && electron .", "dist": "npm run electron-postinstall && npm run build && electron-builder --publish=never", - "dist-prebuilt": "npm run electron-postinstall && npm run build-backend && electron-builder --publish=never" + "dist-prebuilt": "npm run electron-postinstall && npm run build-backend && electron-builder --publish=never", + "dist:mac-arm64": "npm run electron-postinstall && npm run build && electron-builder --mac --arm64 --publish=never", + "dist:mac-universal": "npm run electron-postinstall && npm run build && electron-builder --mac --universal --publish=never" }, "license": "MIT", "engines": { @@ -36,9 +38,14 @@ "buildResources": "electron/build" }, "mac": { - "target": "dmg", + "target": { + "target": "dmg", + "arch": [ + "universal" + ] + }, "identity": null, - "artifactName": "ReticulumMeshChat-v${version}-${os}.${ext}", + "artifactName": "ReticulumMeshChat-v${version}-${os}-${arch}.${ext}", "extendInfo": { "NSMicrophoneUsageDescription": "Microphone access is only needed for Audio Calls", "com.apple.security.device.audio-input": true