Skip to content

Commit

Permalink
Merge pull request #1316 from buttercup/feat/mac_multi_arch
Browse files Browse the repository at this point in the history
Build universal Mac (M1) dmg
  • Loading branch information
perry-mitchell committed Apr 19, 2024
2 parents fe480f4 + d9d1bdf commit cdc5880
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ jobs:
NODE_ARCHITECTURE: x64
ELECTRON_ARGS: --x64

# - os: windows-latest
# NODE_ARCHITECTURE: x86
# ELECTRON_ARGS: --ia32

steps:
- name: Check out Git repository
uses: actions/checkout@v1
Expand All @@ -40,13 +36,6 @@ jobs:
node-version: 18
architecture: ${{matrix.NODE_ARCHITECTURE}}

# - name: Prepare for app notarization
# if: startsWith(matrix.os, 'macos')
# # Import Apple API key for app notarization on macOS
# run: |
# mkdir -p ~/private_keys/
# echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8

- name: Build & Release app
uses: CryogenicPlanet/action-electron-builder@v2
with:
Expand All @@ -62,12 +51,9 @@ jobs:
# release the app after building
release: true
env:
# API_KEY_ID: ${{ secrets.api_key_id }}
# API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
NODE_ARCHITECTURE: ${{matrix.NODE_ARCHITECTURE}}
USE_HARD_LINKS: false
# macOS notarization envs
# APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,15 @@
"icon": "./resources/build/icon.icns",
"notarize": {
"teamId": "9D8F4J769D"
}
},
"target": [
{
"target": "dmg",
"arch": [
"universal"
]
}
]
},
"dmg": {
"artifactName": "${productName}-${os}-x64-${version}.${ext}",
Expand Down

0 comments on commit cdc5880

Please sign in to comment.