From a70837109d8caf41d559b91a3cbeface302698ee Mon Sep 17 00:00:00 2001 From: scosman Date: Sat, 10 Aug 2024 11:21:28 -0400 Subject: [PATCH] Build MacOS Arm and Intel separately. Don't want to have to chase down fat binaries for every single library we use. YAML already failed to work. --- .github/workflows/build_desktop.yml | 2 +- desktop/build_desktop_app.sh | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_desktop.yml b/.github/workflows/build_desktop.yml index c11c6b40..7365b8df 100644 --- a/.github/workflows/build_desktop.yml +++ b/.github/workflows/build_desktop.yml @@ -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 diff --git a/desktop/build_desktop_app.sh b/desktop/build_desktop_app.sh index b7cd8e52..0ca0ecaa 100755 --- a/desktop/build_desktop_app.sh +++ b/desktop/build_desktop_app.sh @@ -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