Skip to content

Commit c43357e

Browse files
authored
feat: Support MacOS Universal Installer (#104)
feat: Support MacOS Universal Installer chore(deps): upgrade tauri npm cli
1 parent e5ab3b5 commit c43357e

File tree

6 files changed

+104
-95
lines changed

6 files changed

+104
-95
lines changed

.github/workflows/tauri-build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- platform: "macos-latest" # for Arm based macs (M1 and above).
18-
name: macos-arm
19-
args: "--target aarch64-apple-darwin"
20-
- platform: "macos-latest" # for Intel based macs.
21-
name: macos-intel
22-
args: "--target x86_64-apple-darwin"
17+
- platform: "macos-latest"
18+
name: macos
19+
args: "--target universal-apple-darwin"
2320
- platform: "ubuntu-24.04"
2421
name: linux
2522
args: ""

package-lock.json

Lines changed: 98 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@storybook/react": "^8.0.10",
3636
"@storybook/react-vite": "^8.0.10",
3737
"@storybook/test": "^8.0.10",
38-
"@tauri-apps/cli": "^2.0.0-beta.20",
38+
"@tauri-apps/cli": "^2.0.0",
3939
"@types/react": "^18.2.66",
4040
"@types/react-dom": "^18.2.22",
4141
"@types/w3c-web-serial": "^1.0.6",

public/zmk-mac.png

869 KB
Loading

src-tauri/icons/icon.icns

406 KB
Binary file not shown.

src-tauri/tauri.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"devUrl": "http://localhost:5173",
77
"frontendDist": "../dist/"
88
},
9-
"productName": "zmk-studio",
9+
"productName": "ZMK Studio",
10+
"mainBinaryName": "zmk-studio",
1011
"version": "0.2.4",
1112
"identifier": "dev.zmk.studio",
1213
"bundle": {

0 commit comments

Comments
 (0)