Skip to content

Add support for universal Mac build (x64 + arm64) #117

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for universal Mac build (x64 + arm64) #117

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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe"

build_mac:
runs-on: macos-13
runs-on: macos-14
permissions:
contents: write
steps:
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Install NodeJS Deps
run: npm install

- name: Build Electron App
- name: Build Electron App (Universal)
run: npm run dist

- name: Create Release
Expand All @@ -80,7 +80,7 @@ jobs:
replacesArtifacts: true
omitDraftDuringUpdate: true
omitNameDuringUpdate: true
artifacts: "dist/*-mac.dmg"
artifacts: "dist/*-mac-*.dmg"

build_linux:
runs-on: ubuntu-latest
Expand Down
17 changes: 13 additions & 4 deletions electron/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,20 @@ app.whenReady().then(async () => {

// find path to python/cxfreeze reticulum meshchat executable
const exeName = process.platform === "win32" ? "ReticulumMeshChat.exe" : "ReticulumMeshChat";
var exe = path.join(__dirname, `build/exe/${exeName}`);

// if dist exe doesn't exist, check local build
if(!fs.existsSync(exe)){
exe = path.join(__dirname, '..', `build/exe/${exeName}`);
var exe;

// In production (packaged app), Python exe is in Resources/python
if(process.resourcesPath && fs.existsSync(path.join(process.resourcesPath, 'python'))){
exe = path.join(process.resourcesPath, 'python', exeName);
}
// In development, use local build
else if(fs.existsSync(path.join(__dirname, '..', 'build', 'exe', exeName))){
exe = path.join(__dirname, '..', 'build', 'exe', exeName);
}
// Fallback
else {
exe = path.join(__dirname, 'build', 'exe', exeName);
}

try {
Expand Down
Loading