From 2c2bf1883fd7448c3dba1fc65462331d8096e0b3 Mon Sep 17 00:00:00 2001 From: FrancescoBorzi Date: Wed, 13 Nov 2024 23:58:23 +0100 Subject: [PATCH] Revert "feat: support macOS arm arch" This reverts commit 8b30813ac56a18936bb63611d7788eb079a6f2b8. --- .github/workflows/release.yml | 12 ++++-------- electron-builder.json | 7 +------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfaa36e192..4e7de34032 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: build-on-mac: needs: get-package-version name: Build and upload the Mac release assets - runs-on: macos-14 + runs-on: macos-13 steps: - name: Checkout code uses: actions/checkout@v4 @@ -83,10 +83,8 @@ jobs: run: | npm install npm run electron:mac - mv "release/${{needs.get-package-version.outputs.app_name}}-${{needs.get-package-version.outputs.version}}.dmg" ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}-x64.MAC.dmg - zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC-x64.dmg.zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}-x64.MAC.dmg - mv "release/${{needs.get-package-version.outputs.app_name}}-${{needs.get-package-version.outputs.version}}-arm64.dmg" ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}-arm64.MAC.dmg - zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}-arm64.MAC.dmg.zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}-arm64.MAC.dmg + mv "release/${{needs.get-package-version.outputs.app_name}}-${{needs.get-package-version.outputs.version}}.dmg" ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC.dmg + zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC.dmg.zip ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC.dmg rm -rf release rm -rf *.yml rm -rf *.blockmap @@ -104,9 +102,7 @@ jobs: release_name: ${{needs.get-package-version.outputs.version}} draft: true prerelease: false - files: | - ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC-x64.dmg.zip - ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC-arm64.dmg.zip + files: ${{needs.get-package-version.outputs.fix_app_name}}-${{needs.get-package-version.outputs.version}}.MAC.dmg.zip build-on-windows: needs: get-package-version diff --git a/electron-builder.json b/electron-builder.json index d48ef04651..3f515db8e0 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -11,12 +11,7 @@ }, "mac": { "icon": "dist/browser", - "target": [ - { - "target": "default", - "arch": ["x64", "arm64"] - } - ] + "target": ["dmg"] }, "linux": { "icon": "dist/browser",