RNS-Things/reticulum-meshchatX
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Merge pull request #22 from Sudo-Ivan/universal-mac-build

Browse Source 
Update build configuration for macOS and update artifact naming.
This commit was merged in pull request #22.
This commit is contained in:
ivan
2025-12-05 22:43:57 -06:00
committed by GitHub
parent d8419990b1 f2ab1ad067
commit 9e1a8ce180
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/build.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
run: npm run build-frontend run: npm run build-frontend
- name: Upload frontend artifact - name: Upload frontend artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with: with:
name: frontend-build name: frontend-build
path: meshchatx/public path: meshchatx/public
@@ -79,18 +79,21 @@ jobs:
python: "3.12" python: "3.12"
release_artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe" release_artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe"
build_input: build_windows build_input: build_windows
dist_script: dist-prebuilt
- name: mac - name: mac
os: macos-13 os: macos-14
node: 18 node: 18
python: "3.11" python: "3.11"
release_artifacts: "dist/*-mac.dmg" release_artifacts: "dist/*-mac-*.dmg"
build_input: build_mac build_input: build_mac
dist_script: dist:mac-universal
- name: linux - name: linux
os: ubuntu-latest os: ubuntu-latest
node: 22 node: 22
python: "3.12" python: "3.12"
release_artifacts: "dist/*-linux.AppImage,dist/*-linux.deb,python-dist/*.whl" release_artifacts: "dist/*-linux.AppImage,dist/*-linux.deb,python-dist/*.whl"
build_input: build_linux build_input: build_linux
dist_script: dist-prebuilt
permissions: permissions:
contents: write contents: write
steps: steps:
@@ -150,7 +153,7 @@ jobs:
if: | if: |
github.event_name == 'push' || github.event_name == 'push' ||
(github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true) (github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true)
uses: actions/download-artifact@v4 uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with: with:
name: frontend-build name: frontend-build
path: meshchatx/public path: meshchatx/public
@@ -173,11 +176,11 @@ jobs:
mv dist/*.whl python-dist/ mv dist/*.whl python-dist/
rm -rf dist rm -rf dist
- name: Build Electron App - name: Build Electron App (Universal)
if: | if: |
github.event_name == 'push' || github.event_name == 'push' ||
(github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true) (github.event_name == 'workflow_dispatch' && inputs[matrix.build_input] == true)
run: npm run dist-prebuilt run: npm run ${{ matrix.dist_script }}
- name: Upload build artifacts - name: Upload build artifacts
if: | if: |
@@ -189,7 +192,7 @@ jobs:
path: | path: |
dist/*-win-installer.exe dist/*-win-installer.exe
dist/*-win-portable.exe dist/*-win-portable.exe
dist/*-mac.dmg dist/*-mac-*.dmg
dist/*-linux.AppImage dist/*-linux.AppImage
dist/*-linux.deb dist/*-linux.deb
python-dist/*.whl python-dist/*.whl
@@ -204,7 +207,7 @@ jobs:
contents: write contents: write
steps: steps:
- name: Download all artifacts - name: Download all artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with: with:
path: artifacts path: artifacts

12
package.json
View File

@@ -12,7 +12,9 @@
"electron-postinstall": "electron-builder install-app-deps", "electron-postinstall": "electron-builder install-app-deps",
"electron": "npm run electron-postinstall && npm run build && electron .", "electron": "npm run electron-postinstall && npm run build && electron .",
"dist": "npm run electron-postinstall && npm run build && electron-builder --publish=never", "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", "license": "MIT",
"engines": { "engines": {
@@ -36,9 +38,15 @@
"buildResources": "electron/build" "buildResources": "electron/build"
}, },
"mac": { "mac": {
"target": {
"target": "dmg", "target": "dmg",
"arch": [
"universal"
]
},
"identity": null, "identity": null,
"artifactName": "ReticulumMeshChat-v${version}-${os}.${ext}", "artifactName": "ReticulumMeshChat-v${version}-mac-${arch}.${ext}",
"x64ArchFiles": "Contents/Resources/app/electron/build/exe/**",
"extendInfo": { "extendInfo": {
"NSMicrophoneUsageDescription": "Microphone access is only needed for Audio Calls", "NSMicrophoneUsageDescription": "Microphone access is only needed for Audio Calls",
"com.apple.security.device.audio-input": true "com.apple.security.device.audio-input": true