Skip to content

Commit c63e9e6

Browse files
committed
First pass at migrating Mac builds too
1 parent f82e1e4 commit c63e9e6

File tree

4 files changed

+64
-21
lines changed

4 files changed

+64
-21
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ jobs:
77
matrix:
88
os: [
99
"ubuntu-18.04",
10-
"windows-2019"
10+
"windows-2019",
11+
"macos-10.15"
1112
]
1213
runs-on: ${{ matrix.os }}
1314
steps:

package-lock.json

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

package.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
"appId": "tech.httptoolkit.desktop",
2727
"extends": null,
2828
"productName": "HTTP Toolkit",
29-
"extraMetadata": { "name": "httptoolkit" },
29+
"extraMetadata": {
30+
"name": "httptoolkit"
31+
},
3032
"files": [
3133
"**/*",
3234
"build/**/*",
@@ -48,8 +50,23 @@
4850
"extraResources": [
4951
"httptoolkit-server/**/*"
5052
],
53+
"mac": {
54+
"target": [
55+
"dmg"
56+
],
57+
"category": "public.app-category.developer-tools",
58+
"icon": "src/icons/icon.icns",
59+
"entitlements": "src/entitlements.plist",
60+
"entitlementsInherit": "src/entitlements.plist",
61+
"forceCodeSigning": false
62+
},
63+
"dmg": {
64+
"background": "src/dmg-background.png"
65+
},
5166
"win": {
52-
"target": ["nsis"],
67+
"target": [
68+
"nsis"
69+
],
5370
"icon": "./src/icons/icon.ico",
5471
"forceCodeSigning": true
5572
},
@@ -101,7 +118,7 @@
101118
"electron": "^4.1.4",
102119
"electron-builder": "^22.9.1",
103120
"electron-forge": "^5.2.4",
104-
"electron-notarize": "^0.2.1",
121+
"electron-notarize": "^1.0.0",
105122
"lodash": "^4.17.19",
106123
"node-fetch": "^2.6.1",
107124
"targz": "^1.0.1",

src/notarize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export = async function () {
1212

1313
return notarize({
1414
appBundleId: 'tech.httptoolkit.desktop',
15-
appPath: projectRoot + '/out/HTTP Toolkit-darwin-x64/HTTP Toolkit.app',
15+
appPath: projectRoot + '/dist/mac/HTTP Toolkit.app',
1616
appleId: process.env.APPLE_ID!,
1717
appleIdPassword: process.env.APPLE_ID_PASSWORD!
1818
}).catch((e) => {

0 commit comments

Comments
 (0)