Skip to content
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

Fix macOS universal building #2166

Merged
merged 2 commits into from
Aug 30, 2023
+4 −8
Merged

Fix macOS universal building #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b848f1
Testing universal mac build with debug info
joeyballentine Aug 30, 2023
fc4eeed
Fix the workflows
joeyballentine Aug 30, 2023
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
4 changes: 1 addition & 3 deletions .github/workflows/make.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ jobs:
if [[ "${{ matrix.os }}" != "macos-latest" ]]; then
npm run make
else
# doesn't work with signing ATM
# npm run make -- --arch=universal
npm run make
npm run make -- --arch=universal
fi
- uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,5 @@ jobs:
if [[ "${{ matrix.os }}" != "macos-latest" ]]; then
npm run publish
else
# doesn't work with signing ATM
# npm run publish -- --arch=universal
npm run publish
npm run publish -- --arch=universal
fi
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dev": "concurrently \"cd backend/src && cross-env CHECK_LEVEL=fix nodemon ./run.py 8000\" \"electron-forge start -- --remote-backend=http://127.0.0.1:8000 --refresh --devtools\"",
"debug": "concurrently \"npm run debug:py\" \"electron-forge start -- --remote-backend=http://127.0.0.1:8000 --refresh --devtools\"",
"debug:py": "cd backend/src && nodemon --exec \"python -m debugpy --listen 5678\" ./run.py 8000",
"package": "cross-env NODE_ENV=production electron-forge package",
"make": "cross-env NODE_ENV=production electron-forge make",
"package": "cross-env NODE_ENV=production DEBUG=electron* electron-forge package",
"make": "cross-env NODE_ENV=production DEBUG=electron* electron-forge make",
"make-linux-zip": "cross-env NODE_ENV=production electron-forge make --targets @electron-forge/maker-zip --platform linux",
"make-win-zip": "cross-env NODE_ENV=production electron-forge make --targets @electron-forge/maker-zip --platform win32",
"publish": "cross-env NODE_ENV=production electron-forge publish",
Expand Down