Skip to content

Commit

Permalink
Fix macOS universal building (chaiNNer-org#2166)
Browse files Browse the repository at this point in the history
* Testing universal mac build with debug info

remove debug env var

i need it to run

add debug printing back

* Fix the workflows
  • Loading branch information
joeyballentine authored Aug 30, 2023
1 parent bbb10d9 commit bff1cae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/make.yml
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
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
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

0 comments on commit bff1cae

Please sign in to comment.