Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change Windows signing to warning when missing token

Browse Source 
This allows Windows builds to complete when the singing token is not present.
This commit is contained in:
J. Ryan Stinnett 2020-02-26 11:54:20 +00:00
parent 4916ed0870
commit 096a828e44
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/electron_afterSign.js
View File

@ -11,9 +11,10 @@ exports.default = async function(context) {
const userId = process.env.NOTARIZE_APPLE_ID; const userId = process.env.NOTARIZE_APPLE_ID;
if (userId === undefined) { if (userId === undefined) {
console.warn( console.warn(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
"! Skipping notarisation: User ID not found, set NOTARIZE_APPLE_ID. !\n" + "! Skipping macOS notarisation. !\n" +
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", "! User ID not found, set NOTARIZE_APPLE_ID. !\n" +
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
); );
return; return;
} }

16
scripts/electron_winSign.js
View File

@ -8,16 +8,15 @@ exports.default = async function(options) {
const appOutDir = path.dirname(inPath); const appOutDir = path.dirname(inPath);
// get the token passphrase from the keychain // get the token passphrase from the keychain
const tokenPassphrase = await new Promise((resolve, reject) => { let tokenPassphrase;
try {
tokenPassphrase = await new Promise((resolve, reject) => {
execFile( execFile(
'security', 'security',
['find-generic-password', '-s', 'riot_signing_token', '-w'], ['find-generic-password', '-s', 'riot_signing_token', '-w'],
{}, {},
(err, stdout) => { (err, stdout) => {
if (err) { if (err) {
console.error("Couldn't find signing token in keychain", err);
// electron-builder seems to print '[object Object]' on the
// console whether you reject with an Error or a string...
reject(err); reject(err);
} else { } else {
resolve(stdout.trim()); resolve(stdout.trim());
@ -25,6 +24,15 @@ exports.default = async function(options) {
}, },
); );
}); });
} catch (err) {
console.warn(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
"! Skipping Windows signing. !\n" +
"! Signing token not found in keychain. !\n" +
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
);
return;
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let cmdLine = 'osslsigncode sign '; let cmdLine = 'osslsigncode sign ';