gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #12523 from vector-im/jryans/relax-windows-signing 

Change Windows signing to warning when missing token
This commit is contained in:
J. Ryan Stinnett 2020-02-26 13:31:48 +00:00 committed by GitHub
parent dacbc4dc6d 096a828e44
commit 76430a9c77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ';