Skip to content

Commit

Permalink
Build MacOS Arm and Intel separately. Don't want to have to chase dow…
Browse files Browse the repository at this point in the history
…n fat binaries for every single library we use. YAML already failed to work.
  • Loading branch information
scosman committed Aug 10, 2024
1 parent 080e5dd commit a708371
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["windows-latest", "macos-latest"]
os: ["windows-latest", "macos-latest", "macos-13"]

steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 1 addition & 7 deletions desktop/build_desktop_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@ if [ "$(uname)" == "Darwin" ]; then
# onedir launches faster, and still looks like 1 file with MacOS .app bundles
PLATFORM_OPTS="--onedir --osx-bundle-identifier=net.scosman.fune"

# TODO: test this on Github/universal python builds
PY_PLAT=$(python -c 'import sysconfig; print(sysconfig.get_platform().split("-")[-1])')
if [ "$PY_PLAT" == "universal2" ]; then
echo "Building Universal MacOS App"
PLATFORM_OPTS="$PLATFORM_OPTS --target-arch=universal2"
else
echo "Warning: MacOS app for single platform ($PY_PLAT)"
fi
echo "Building MacOS app for single platform ($PY_PLAT)"
else
echo "Building Windows App"
cp desktop/win_taskbar.png desktop/build/taskbar.png
Expand Down

0 comments on commit a708371

Please sign in to comment.