Skip to content

Commit 8b186a9

Browse files
authored
feat: Switch to universal builds for macOS (#509)
1 parent b705088 commit 8b186a9

File tree

3 files changed

+350
-263
lines changed

3 files changed

+350
-263
lines changed

.github/workflows/build-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: yarn make:macos --publish=never -c.mac.identity=null
3434

3535
- name: Clean up builds
36-
run: rm -rfv dist/mac dist/mac-arm64
36+
run: rm -rfv dist/mac-universal
3737

3838
- uses: actions/upload-artifact@v2
3939
with:

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"build": "webpack --config webpack.prod.js",
88
"watch": "webpack --config webpack.common.js --watch",
99
"make:linux": "electron-builder --linux",
10-
"make:macos": "electron-builder --mac --x64 --arm64",
11-
"make:macos:x64": "electron-builder --mac --x64",
12-
"make:macos:arm64": "electron-builder --mac --arm64",
10+
"make:macos": "electron-builder --mac --universal",
1311
"make:win": "electron-builder --win",
1412
"prettier:check": "prettier --check 'src/**/*.{js,ts,tsx}'",
1513
"prettier:apply": "prettier --write 'src/**/*.{js,ts,tsx}'",
@@ -112,10 +110,10 @@
112110
"autoprefixer": "^10.1.0",
113111
"axios": "=0.21.1",
114112
"date-fns": "^2.16.1",
115-
"electron-updater": "^4.3.5",
113+
"electron-updater": "^4.3.9",
116114
"final-form": "^4.20.1",
117115
"lodash": "^4.17.20",
118-
"menubar": "^9.0.1",
116+
"menubar": "^9.0.5",
119117
"nprogress": "=0.2.0",
120118
"postcss": "^8.2.1",
121119
"react": "=16.13.1",
@@ -134,14 +132,14 @@
134132
"@testing-library/react-hooks": "^3.7.0",
135133
"@types/jest": "^26.0.19",
136134
"@types/lodash": "^4.14.165",
137-
"@types/node": "^14.14.14",
135+
"@types/node": "^16.4.8",
138136
"@types/react": "^16.9.32",
139137
"@types/react-router-dom": "^5.1.6",
140138
"@types/react-transition-group": "^4.4.0",
141139
"css-loader": "^5.0.1",
142-
"electron": "^11.1.0",
143-
"electron-builder": "^22.10.4",
144-
"electron-notarize": "^1.0.0",
140+
"electron": "^13.1.7",
141+
"electron-builder": "^22.11.7",
142+
"electron-notarize": "^1.0.1",
145143
"jest": "^26.6.3",
146144
"nock": "^13.0.5",
147145
"postcss-loader": "^4.1.0",

0 commit comments

Comments
 (0)