Page MenuHomePhorge
Files F33303835

D6232.1768785087.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D6232.1768785087.diff
View Options

diff --git a/desktop/forge.config.cjs b/desktop/forge.config.cjs
--- a/desktop/forge.config.cjs
+++ b/desktop/forge.config.cjs
@@ -57,6 +57,33 @@
}
}
+const signingOptions = {
+ packagerMacos: {},
+ makerMacos: {},
+ makerWindows: {},
+};
+if (process.env?.ENV !== 'dev') {
+ signingOptions.packagerMacos = {
+ osxSign: { identity: 'Developer ID Application' },
+ osxNotarize: {
+ tool: 'notarytool',
+ appleId: process.env?.APPLE_USER_NAME,
+ appleIdPassword: process.env?.APPLE_APP_SPECIFIC_PASSWORD,
+ teamId: process.env?.TEAM_ID,
+ },
+ };
+ signingOptions.makerMacos = {
+ 'code-sign': {
+ 'signing-identity': 'Developer ID Application',
+ 'identifier': 'app.comm.macos',
+ },
+ };
+ signingOptions.makerWindows = {
+ certificateFile: process.env?.WINDOWS_CERTIFICATE,
+ certificatePassword: process.env?.WINDOWS_PASSWORD,
+ };
+}
+
module.exports = {
packagerConfig: {
name: 'Comm',
@@ -69,13 +96,7 @@
'flow-typed',
],
appBundleId: 'app.comm.macos',
- osxSign: { identity: 'Developer ID Application' },
- osxNotarize: {
- tool: 'notarytool',
- appleId: process.env?.APPLE_USER_NAME,
- appleIdPassword: process.env?.APPLE_APP_SPECIFIC_PASSWORD,
- teamId: process.env?.TEAM_ID,
- },
+ ...signingOptions.packagerMacos,
},
makers: [
{
@@ -84,12 +105,7 @@
config: {
icon: 'icons/icon.icns',
background: 'icons/dmg_background.png',
- additionalDMGOptions: {
- 'code-sign': {
- 'signing-identity': 'Developer ID Application',
- 'identifier': 'app.comm.macos',
- },
- },
+ additionalDMGOptions: { ...signingOptions.makerMacos },
contents: opts => [
{ x: 340, y: 100, type: 'link', path: '/Applications' },
{ x: 100, y: 100, type: 'file', path: opts.appPath },
@@ -107,8 +123,7 @@
iconUrl: 'https://comm-external.s3.amazonaws.com/icon.ico',
setupIcon: 'icons/icon.ico',
loadingGif: 'icons/win_installer.gif',
- certificateFile: process.env?.WINDOWS_CERTIFICATE,
- certificatePassword: process.env?.WINDOWS_PASSWORD,
+ ...signingOptions.makerWindows,
},
},
],
diff --git a/desktop/package.json b/desktop/package.json
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -13,7 +13,9 @@
"scripts": {
"dev": "ENV=dev electron-forge start",
"package": "electron-forge package",
+ "package-dev": "ENV=dev electron-forge package",
"make": "electron-forge make",
+ "make-dev": "ENV=dev electron-forge make",
"clean": "rm -rf assets/ && rm -rf dist/ && yarn clean-build && rm -rf node_modules/",
"clean-build": "rm -rf out/"
},

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 1:11 AM (2 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5953707
Default Alt Text
D6232.1768785087.diff (2 KB)

Event Timeline