Skip to content

Commit c64cb4c

Browse files
itsmesamsterAmmarAbouZor
itsmesamster
authored and
AmmarAbouZor
committed
Resolve macOS code notarisation issue with electron upgrade
1 parent 485c1e2 commit c64cb4c

7 files changed

Lines changed: 78 additions & 46 deletions

File tree

‎application/holder/electron.config.darwin.arm64.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"appId": "com.esrlabs.chipmunk",
44
"productName": "chipmunk",
55
"copyright": "Copyright © 2022 year ESR Labs",
6-
"files": ["./dist/**", "./resources/**"],
6+
"files": [
7+
"./dist/**",
8+
"./resources/**",
9+
"!**/node_modules/electron/**",
10+
"!**/node_modules/rustcore/{src,spec,.yarn}/**",
11+
"!**/node_modules/rustcore/{.yarnrc.yml,.eslintrc.json,eslint.config.mjs,launch.json,tsconfig.json}"
12+
],
713
"extraFiles": [
814
{
915
"from": "../apps/precompiled/updater/target/release",

‎application/holder/electron.config.darwin.x86.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"appId": "com.esrlabs.chipmunk",
44
"productName": "chipmunk",
55
"copyright": "Copyright © 2022 year ESR Labs",
6-
"files": ["./dist/**", "./resources/**"],
6+
"files": [
7+
"./dist/**",
8+
"./resources/**",
9+
"!**/node_modules/electron/**",
10+
"!**/node_modules/rustcore/{src,spec,.yarn}/**",
11+
"!**/node_modules/rustcore/{.yarnrc.yml,.eslintrc.json,eslint.config.mjs,launch.json,tsconfig.json}"
12+
],
713
"extraFiles": [
814
{
915
"from": "../apps/precompiled/updater/target/release",

‎application/holder/electron.config.linux.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"appId": "com.esrlabs.chipmunk",
44
"productName": "chipmunk",
55
"copyright": "Copyright © 2022 year ESR Labs",
6-
"files": ["./dist/**", "./resources/**"],
6+
"files": [
7+
"./dist/**",
8+
"./resources/**",
9+
"!**/node_modules/electron/**",
10+
"!**/node_modules/rustcore/{src,spec,.yarn}/**",
11+
"!**/node_modules/rustcore/{.yarnrc.yml,.eslintrc.json,eslint.config.mjs,launch.json,tsconfig.json}"
12+
],
713
"extraFiles": [
814
{
915
"from": "../apps/precompiled/updater/target/release",

‎application/holder/electron.config.win.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"appId": "com.esrlabs.chipmunk",
44
"productName": "chipmunk",
55
"copyright": "Copyright © 2022 year ESR Labs",
6-
"files": ["./dist/**", "./resources/**"],
6+
"files": [
7+
"./dist/**",
8+
"./resources/**",
9+
"!**/node_modules/electron/**",
10+
"!**/node_modules/rustcore/{src,spec,.yarn}/**",
11+
"!**/node_modules/rustcore/{.yarnrc.yml,.eslintrc.json,eslint.config.mjs,launch.json,tsconfig.json}"
12+
],
713
"extraFiles": [
814
{
915
"from": "../apps/precompiled/updater/target/release",
@@ -19,6 +25,6 @@
1925
"npmRebuild": true,
2026
"win": {
2127
"icon": "resources/win/chipmunk.ico",
22-
"target": [],
28+
"target": []
2329
}
2430
}

‎application/holder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"dotenv": "^16.4.7",
5151
"dotnet": "^1.1.4",
5252
"electron": "^34.0.1",
53-
"electron-builder": "26.7.0",
53+
"electron-builder": "26.9.0",
5454
"eslint": "^9.18.0",
5555
"eslint-plugin-import": "^2.31.0",
5656
"eslint-plugin-node": "^11.1.0",

‎application/holder/yarn.lock‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -801,9 +801,9 @@ __metadata:
801801
languageName: node
802802
linkType: hard
803803

804-
"app-builder-lib@npm:26.7.0":
805-
version: 26.7.0
806-
resolution: "app-builder-lib@npm:26.7.0"
804+
"app-builder-lib@npm:26.9.0":
805+
version: 26.9.0
806+
resolution: "app-builder-lib@npm:26.9.0"
807807
dependencies:
808808
"@develar/schema-utils": "npm:~2.6.5"
809809
"@electron/asar": "npm:3.4.1"
@@ -816,15 +816,15 @@ __metadata:
816816
"@malept/flatpak-bundler": "npm:^0.4.0"
817817
"@types/fs-extra": "npm:9.0.13"
818818
async-exit-hook: "npm:^2.0.1"
819-
builder-util: "npm:26.4.1"
820-
builder-util-runtime: "npm:9.5.1"
819+
builder-util: "npm:26.9.0"
820+
builder-util-runtime: "npm:9.6.0"
821821
chromium-pickle-js: "npm:^0.2.0"
822822
ci-info: "npm:4.3.1"
823823
debug: "npm:^4.3.4"
824824
dotenv: "npm:^16.4.5"
825825
dotenv-expand: "npm:^11.0.6"
826826
ejs: "npm:^3.1.8"
827-
electron-publish: "npm:26.6.0"
827+
electron-publish: "npm:26.9.0"
828828
fs-extra: "npm:^10.1.0"
829829
hosted-git-info: "npm:^4.1.0"
830830
isbinaryfile: "npm:^5.0.0"
@@ -842,9 +842,9 @@ __metadata:
842842
tiny-async-pool: "npm:1.3.0"
843843
which: "npm:^5.0.0"
844844
peerDependencies:
845-
dmg-builder: 26.7.0
846-
electron-builder-squirrel-windows: 26.7.0
847-
checksum: 10c0/74b83258665d502c20ae462fcf6cc7ae3da166fa0948ae8f6239b62c52e1d6ad1941c7f6ff3309be5972edee499b539a74ee5f38469d054f5e2d4540a952f7ac
845+
dmg-builder: 26.9.0
846+
electron-builder-squirrel-windows: 26.9.0
847+
checksum: 10c0/302ea1c88da82d38231b16425e7fe58baeff8f0ed1a9c8bf10bf5c762e779280de67b62014485098e03f3c54aded028d60c9758ea45fe141eb4c536428e6ebfe
848848
languageName: node
849849
linkType: hard
850850

@@ -1081,24 +1081,24 @@ __metadata:
10811081
languageName: node
10821082
linkType: hard
10831083

1084-
"builder-util-runtime@npm:9.5.1":
1085-
version: 9.5.1
1086-
resolution: "builder-util-runtime@npm:9.5.1"
1084+
"builder-util-runtime@npm:9.6.0":
1085+
version: 9.6.0
1086+
resolution: "builder-util-runtime@npm:9.6.0"
10871087
dependencies:
10881088
debug: "npm:^4.3.4"
10891089
sax: "npm:^1.2.4"
1090-
checksum: 10c0/b6f95e18d7f6201f95b42658bb7c8e2d29f96d6beeef64c4c9f54ff9d71e6459ca55f325512da9fea23378b9804fcade8fcad88dab81ba3f96958c86492a2ca9
1090+
checksum: 10c0/e3b0b47e20dcbb5fea4b7204bcedcf5983a58159b89af4e44c49a0aa2bff79f0d52c799303532bab3decea73bbbd3f35b0b1baa6433d19d3f806e994531295cb
10911091
languageName: node
10921092
linkType: hard
10931093

1094-
"builder-util@npm:26.4.1":
1095-
version: 26.4.1
1096-
resolution: "builder-util@npm:26.4.1"
1094+
"builder-util@npm:26.9.0":
1095+
version: 26.9.0
1096+
resolution: "builder-util@npm:26.9.0"
10971097
dependencies:
10981098
7zip-bin: "npm:~5.2.0"
10991099
"@types/debug": "npm:^4.1.6"
11001100
app-builder-bin: "npm:5.0.0-alpha.12"
1101-
builder-util-runtime: "npm:9.5.1"
1101+
builder-util-runtime: "npm:9.6.0"
11021102
chalk: "npm:^4.1.2"
11031103
cross-spawn: "npm:^7.0.6"
11041104
debug: "npm:^4.3.4"
@@ -1111,7 +1111,7 @@ __metadata:
11111111
stat-mode: "npm:^1.0.0"
11121112
temp-file: "npm:^3.4.0"
11131113
tiny-async-pool: "npm:1.3.0"
1114-
checksum: 10c0/6140fe90c700c5170fa2a61ea459fc6778a9fbbb56c23b677411d2f822c2d0603979fa0894236bbc2e9fdfca7c20e3923598d3cf3375fc2f15ce2079908d7bca
1114+
checksum: 10c0/72af72a97d1e4b5140cded2d498c4bb52c1ab98f9ca6677126130f8067ed48364d641a249b1c75fa033b397c892a55c40728723040f30fa11d34c8ffb188607d
11151115
languageName: node
11161116
linkType: hard
11171117

@@ -1222,7 +1222,7 @@ __metadata:
12221222
dotenv: "npm:^16.4.7"
12231223
dotnet: "npm:^1.1.4"
12241224
electron: "npm:^34.0.1"
1225-
electron-builder: "npm:26.7.0"
1225+
electron-builder: "npm:26.9.0"
12261226
eslint: "npm:^9.18.0"
12271227
eslint-plugin-import: "npm:^2.31.0"
12281228
eslint-plugin-node: "npm:^11.1.0"
@@ -1543,20 +1543,20 @@ __metadata:
15431543
languageName: node
15441544
linkType: hard
15451545

1546-
"dmg-builder@npm:26.7.0":
1547-
version: 26.7.0
1548-
resolution: "dmg-builder@npm:26.7.0"
1546+
"dmg-builder@npm:26.9.0":
1547+
version: 26.9.0
1548+
resolution: "dmg-builder@npm:26.9.0"
15491549
dependencies:
1550-
app-builder-lib: "npm:26.7.0"
1551-
builder-util: "npm:26.4.1"
1550+
app-builder-lib: "npm:26.9.0"
1551+
builder-util: "npm:26.9.0"
15521552
dmg-license: "npm:^1.0.11"
15531553
fs-extra: "npm:^10.1.0"
15541554
iconv-lite: "npm:^0.6.2"
15551555
js-yaml: "npm:^4.1.0"
15561556
dependenciesMeta:
15571557
dmg-license:
15581558
optional: true
1559-
checksum: 10c0/47a1f712e11e00f9e0d16eb82af19b4ee9e8f3c83f6f8f4bdfc5f60e2e5ee4e6d84a27ce71b6774af9f03eea8dc49e6f95bf1b77b978cb4a3f53f625242024f2
1559+
checksum: 10c0/eb62a9bd380e2251032370ceee120fdef248ed06fb626be8eebc189c2bd788bb7ae49c8d95ce8f26f580582352bcbd536d27b8f9095b3cae1da788e2f5a185aa
15601560
languageName: node
15611561
linkType: hard
15621562

@@ -1650,40 +1650,40 @@ __metadata:
16501650
languageName: node
16511651
linkType: hard
16521652

1653-
"electron-builder@npm:26.7.0":
1654-
version: 26.7.0
1655-
resolution: "electron-builder@npm:26.7.0"
1653+
"electron-builder@npm:26.9.0":
1654+
version: 26.9.0
1655+
resolution: "electron-builder@npm:26.9.0"
16561656
dependencies:
1657-
app-builder-lib: "npm:26.7.0"
1658-
builder-util: "npm:26.4.1"
1659-
builder-util-runtime: "npm:9.5.1"
1657+
app-builder-lib: "npm:26.9.0"
1658+
builder-util: "npm:26.9.0"
1659+
builder-util-runtime: "npm:9.6.0"
16601660
chalk: "npm:^4.1.2"
16611661
ci-info: "npm:^4.2.0"
1662-
dmg-builder: "npm:26.7.0"
1662+
dmg-builder: "npm:26.9.0"
16631663
fs-extra: "npm:^10.1.0"
16641664
lazy-val: "npm:^1.0.5"
16651665
simple-update-notifier: "npm:2.0.0"
16661666
yargs: "npm:^17.6.2"
16671667
bin:
16681668
electron-builder: cli.js
16691669
install-app-deps: install-app-deps.js
1670-
checksum: 10c0/69ac66db84a9ebea2589c5b35a83926f6b2c379cade9f04e843cfc67b1da84ba8cca391e3cfb36302f7be99c20157d87ec964a445a5c3a7779628d9aa2bc9876
1670+
checksum: 10c0/6590ad90686e779dcdb8d2208c7518db45fc2754afaa15c1c154fa8eaad5445f267228d9aa235489220bc11d82235621f05e467b342621dfca6209e777bbb426
16711671
languageName: node
16721672
linkType: hard
16731673

1674-
"electron-publish@npm:26.6.0":
1675-
version: 26.6.0
1676-
resolution: "electron-publish@npm:26.6.0"
1674+
"electron-publish@npm:26.9.0":
1675+
version: 26.9.0
1676+
resolution: "electron-publish@npm:26.9.0"
16771677
dependencies:
16781678
"@types/fs-extra": "npm:^9.0.11"
1679-
builder-util: "npm:26.4.1"
1680-
builder-util-runtime: "npm:9.5.1"
1679+
builder-util: "npm:26.9.0"
1680+
builder-util-runtime: "npm:9.6.0"
16811681
chalk: "npm:^4.1.2"
16821682
form-data: "npm:^4.0.5"
16831683
fs-extra: "npm:^10.1.0"
16841684
lazy-val: "npm:^1.0.5"
16851685
mime: "npm:^2.5.2"
1686-
checksum: 10c0/3aef935010090b197a0942676bc62ee55f84343b0f7986023f8a97108b0891218edfb72b20cfd3c320dcbd4c0054c5629c27914131ae26b124be0610806f01ce
1686+
checksum: 10c0/9b28bcb78471f033bd552cdac712268e70ac33d1cff6f9365d775e55c2c46082d29d5207acdf9edfee5428be62e1388b8fde19310ea9e637d045fbab00e3b5c4
16871687
languageName: node
16881688
linkType: hard
16891689

‎cli/development-cli/config/codesign_macos.toml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ single_paths = [
2828
"chipmunk.app",
2929
]
3030
# Patterns to be used with glob to retrieve all matching files under that patterns.
31-
glob_patterns = ["chipmunk.app/Contents/Frameworks/*.framework/Versions/A/**/*"]
31+
glob_patterns = [
32+
# Frameworks
33+
"chipmunk.app/Contents/Frameworks/**/*.framework/**",
34+
"chipmunk.app/Contents/Frameworks/**/*.dylib",
35+
"chipmunk.app/Contents/Frameworks/**/*.app",
36+
"chipmunk.app/Contents/Frameworks/**/Resources/ShipIt",
37+
# Unpacked asar resources
38+
"chipmunk.app/Contents/Resources/app.asar.unpacked/**/*.node",
39+
]
3240

3341
# Represents the components for the final sign command (Command for deep and strict code signing)
3442
[final_sign_command]

0 commit comments

Comments
 (0)