mirror of
https://github.com/mifi/lossless-cut.git
synced 2024-11-22 10:22:31 +01:00
try to fix notarize instability
This commit is contained in:
Mikael Finstad
parent
44d4e4a787
commit
db4c2a2f0b
@ -18,7 +18,7 @@
|
||||
"prepack-mac": "yarn build",
|
||||
"pack-win": "electron-builder --win",
|
||||
"prepack-win": "yarn build",
|
||||
"postinstall": "electron-builder install-app-deps",
|
||||
"postinstall": "patch-package && electron-builder install-app-deps",
|
||||
"pack-linux": "electron-builder --linux",
|
||||
"prepack-linux": "yarn build"
|
||||
},
|
||||
@ -60,6 +60,7 @@
|
||||
"mousetrap": "^1.6.1",
|
||||
"p-map": "^3.0.0",
|
||||
"p-queue": "^6.2.0",
|
||||
"patch-package": "^6.2.1",
|
||||
"pretty-ms": "^6.0.0",
|
||||
"react": "^16.12.0",
|
||||
"react-dom": "^16.12.0",
|
||||
|
||||
125
patches/electron-notarize+0.2.1.patch
Normal file
125
patches/electron-notarize+0.2.1.patch
Normal file
@ -0,0 +1,125 @@
|
||||
diff --git a/node_modules/electron-notarize/lib/index.d.ts b/node_modules/electron-notarize/lib/index.d.ts
|
||||
index fa85cc0..b907a32 100644
|
||||
--- a/node_modules/electron-notarize/lib/index.d.ts
|
||||
+++ b/node_modules/electron-notarize/lib/index.d.ts
|
||||
@@ -1,3 +1,4 @@
|
||||
+export { validateAuthorizationArgs } from './validate-args';
|
||||
export interface NotarizePasswordCredentials {
|
||||
appleId: string;
|
||||
appleIdPassword: string;
|
||||
diff --git a/node_modules/electron-notarize/lib/index.js b/node_modules/electron-notarize/lib/index.js
|
||||
index f47fdf1..ba35151 100644
|
||||
--- a/node_modules/electron-notarize/lib/index.js
|
||||
+++ b/node_modules/electron-notarize/lib/index.js
|
||||
@@ -21,11 +21,16 @@ var __rest = (this && this.__rest) || function (s, e) {
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const debug = require("debug");
|
||||
const path = require("path");
|
||||
+const p_retry_1 = require("p-retry");
|
||||
const spawn_1 = require("./spawn");
|
||||
const helpers_1 = require("./helpers");
|
||||
+const validate_args_1 = require("./validate-args");
|
||||
const d = debug('electron-notarize');
|
||||
-function authorizationArgs(opts) {
|
||||
- if ('appleId' in opts) {
|
||||
+var validate_args_2 = require("./validate-args");
|
||||
+exports.validateAuthorizationArgs = validate_args_2.validateAuthorizationArgs;
|
||||
+function authorizationArgs(rawOpts) {
|
||||
+ const opts = validate_args_1.validateAuthorizationArgs(rawOpts);
|
||||
+ if (validate_args_1.isPasswordCredentials(opts)) {
|
||||
return ['-u', helpers_1.makeSecret(opts.appleId), '-p', helpers_1.makeSecret(opts.appleIdPassword)];
|
||||
}
|
||||
else {
|
||||
@@ -62,10 +67,13 @@ function startNotarize(opts) {
|
||||
if (opts.ascProvider) {
|
||||
notarizeArgs.push('-itc_provider', opts.ascProvider);
|
||||
}
|
||||
- const result = yield spawn_1.spawn('xcrun', notarizeArgs);
|
||||
- if (result.code !== 0) {
|
||||
- throw new Error(`Failed to upload app to Apple's notarization servers\n\n${result.output}`);
|
||||
- }
|
||||
+ const result = yield p_retry_1.default(() => __awaiter(this, void 0, void 0, function* () {
|
||||
+ const result = yield spawn_1.spawn('xcrun', notarizeArgs);
|
||||
+ if (result.code !== 0) {
|
||||
+ throw new p_retry_1.default.AbortError(`Failed to upload app to Apple's notarization servers\n\n${result.output}`);
|
||||
+ }
|
||||
+ return result;
|
||||
+ }), { retries: 5 });
|
||||
d('upload success');
|
||||
const uuidMatch = /\nRequestUUID = (.+?)\n/g.exec(result.output);
|
||||
if (!uuidMatch) {
|
||||
diff --git a/node_modules/electron-notarize/lib/index.js.map b/node_modules/electron-notarize/lib/index.js.map
|
||||
index d69501c..4dfb732 100644
|
||||
--- a/node_modules/electron-notarize/lib/index.js.map
|
||||
+++ b/node_modules/electron-notarize/lib/index.js.map
|
||||
@@ -1 +1 @@
|
||||
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
||||
\ No newline at end of file
|
||||
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
||||
\ No newline at end of file
|
||||
diff --git a/node_modules/electron-notarize/lib/validate-args.d.ts b/node_modules/electron-notarize/lib/validate-args.d.ts
|
||||
new file mode 100644
|
||||
index 0000000..8e11530
|
||||
--- /dev/null
|
||||
+++ b/node_modules/electron-notarize/lib/validate-args.d.ts
|
||||
@@ -0,0 +1,4 @@
|
||||
+import { NotarizeApiKeyCredentials, NotarizeCredentials, NotarizePasswordCredentials } from './index';
|
||||
+export declare function isPasswordCredentials(opts: NotarizeCredentials): opts is NotarizePasswordCredentials;
|
||||
+export declare function isApiKeyCredentials(opts: NotarizeCredentials): opts is NotarizeApiKeyCredentials;
|
||||
+export declare function validateAuthorizationArgs(opts: NotarizeCredentials): NotarizeCredentials;
|
||||
diff --git a/node_modules/electron-notarize/lib/validate-args.js b/node_modules/electron-notarize/lib/validate-args.js
|
||||
new file mode 100644
|
||||
index 0000000..389f35a
|
||||
--- /dev/null
|
||||
+++ b/node_modules/electron-notarize/lib/validate-args.js
|
||||
@@ -0,0 +1,41 @@
|
||||
+Object.defineProperty(exports, "__esModule", { value: true });
|
||||
+function isPasswordCredentials(opts) {
|
||||
+ const creds = opts;
|
||||
+ return creds.appleId !== undefined || creds.appleIdPassword !== undefined;
|
||||
+}
|
||||
+exports.isPasswordCredentials = isPasswordCredentials;
|
||||
+function isApiKeyCredentials(opts) {
|
||||
+ const creds = opts;
|
||||
+ return creds.appleApiKey !== undefined || creds.appleApiIssuer !== undefined;
|
||||
+}
|
||||
+exports.isApiKeyCredentials = isApiKeyCredentials;
|
||||
+function validateAuthorizationArgs(opts) {
|
||||
+ const isPassword = isPasswordCredentials(opts);
|
||||
+ const isApiKey = isApiKeyCredentials(opts);
|
||||
+ if (isPassword && isApiKey) {
|
||||
+ throw new Error('Cannot use both password credentials and API key credentials at once');
|
||||
+ }
|
||||
+ if (isPassword) {
|
||||
+ const passwordCreds = opts;
|
||||
+ if (!passwordCreds.appleId) {
|
||||
+ throw new Error('The appleId property is required when using notarization with appleIdPassword');
|
||||
+ }
|
||||
+ else if (!passwordCreds.appleIdPassword) {
|
||||
+ throw new Error('The appleIdPassword property is required when using notarization with appleId');
|
||||
+ }
|
||||
+ return passwordCreds;
|
||||
+ }
|
||||
+ if (isApiKey) {
|
||||
+ const apiKeyCreds = opts;
|
||||
+ if (!apiKeyCreds.appleApiKey) {
|
||||
+ throw new Error('The appleApiKey property is required when using notarization with appleApiIssuer');
|
||||
+ }
|
||||
+ else if (!apiKeyCreds.appleApiIssuer) {
|
||||
+ throw new Error('The appleApiIssuer property is required when using notarization with appleApiKey');
|
||||
+ }
|
||||
+ return apiKeyCreds;
|
||||
+ }
|
||||
+ throw new Error('No authentication properties provided (e.g. appleId, appleApiKey)');
|
||||
+}
|
||||
+exports.validateAuthorizationArgs = validateAuthorizationArgs;
|
||||
+//# sourceMappingURL=validate-args.js.map
|
||||
\ No newline at end of file
|
||||
diff --git a/node_modules/electron-notarize/lib/validate-args.js.map b/node_modules/electron-notarize/lib/validate-args.js.map
|
||||
new file mode 100644
|
||||
index 0000000..067f373
|
||||
--- /dev/null
|
||||
+++ b/node_modules/electron-notarize/lib/validate-args.js.map
|
||||
@@ -0,0 +1 @@
|
||||
+{"version":3,"file":"validate-args.js","sourceRoot":"","sources":["../src/validate-args.ts"],"names":[],"mappings":";AAMA,SAAgB,qBAAqB,CACnC,IAAyB;IAEzB,MAAM,KAAK,GAAG,IAAmC,CAAC;IAClD,OAAO,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS,CAAC;AAC5E,CAAC;AALD,sDAKC;AAED,SAAgB,mBAAmB,CAAC,IAAyB;IAC3D,MAAM,KAAK,GAAG,IAAiC,CAAC;IAChD,OAAO,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC;AAC/E,CAAC;AAHD,kDAGC;AAED,SAAgB,yBAAyB,CAAC,IAAyB;IACjE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,UAAU,IAAI,QAAQ,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;KACzF;IACD,IAAI,UAAU,EAAE;QACd,MAAM,aAAa,GAAG,IAAmC,CAAC;QAC1D,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YAC1B,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;SACH;aAAM,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE;YACzC,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;SACH;QACD,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,QAAQ,EAAE;QACZ,MAAM,WAAW,GAAG,IAAiC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;SACH;aAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;SACH;QACD,OAAO,WAAW,CAAC;KACpB;IACD,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;AACvF,CAAC;AAjCD,8DAiCC"}
|
||||
\ No newline at end of file
|
||||
42
yarn.lock
42
yarn.lock
@ -1904,6 +1904,11 @@
|
||||
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
|
||||
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
|
||||
|
||||
"@yarnpkg/lockfile@^1.1.0":
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
|
||||
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
|
||||
|
||||
abab@^2.0.0:
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
|
||||
@ -5424,6 +5429,14 @@ find-up@^3.0.0:
|
||||
dependencies:
|
||||
locate-path "^3.0.0"
|
||||
|
||||
find-yarn-workspace-root@^1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
|
||||
integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
|
||||
dependencies:
|
||||
fs-extra "^4.0.3"
|
||||
micromatch "^3.1.4"
|
||||
|
||||
flat-cache@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
|
||||
@ -5573,7 +5586,7 @@ fs-extra@^1.0.0:
|
||||
jsonfile "^2.1.0"
|
||||
klaw "^1.0.0"
|
||||
|
||||
fs-extra@^4.0.2:
|
||||
fs-extra@^4.0.2, fs-extra@^4.0.3:
|
||||
version "4.0.3"
|
||||
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
|
||||
integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
|
||||
@ -5582,7 +5595,7 @@ fs-extra@^4.0.2:
|
||||
jsonfile "^4.0.0"
|
||||
universalify "^0.1.0"
|
||||
|
||||
fs-extra@^7.0.0:
|
||||
fs-extra@^7.0.0, fs-extra@^7.0.1:
|
||||
version "7.0.1"
|
||||
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
|
||||
integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
|
||||
@ -7659,6 +7672,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
|
||||
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
|
||||
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
|
||||
|
||||
klaw-sync@^6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
|
||||
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
|
||||
dependencies:
|
||||
graceful-fs "^4.1.11"
|
||||
|
||||
klaw@^1.0.0:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
|
||||
@ -9060,6 +9080,24 @@ pascalcase@^0.1.1:
|
||||
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
|
||||
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
|
||||
|
||||
patch-package@^6.2.1:
|
||||
version "6.2.1"
|
||||
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.2.1.tgz#e3c55cf09dffd3984dd300e30d842672b604307f"
|
||||
integrity sha512-dfCtQor63PPij6DDYtCzBRoO5nNAcMSg7Cmh+DLhR+s3t0OLQBdvFxJksZHBe1J2MjsSWDjTF4+oQKFbdkssIg==
|
||||
dependencies:
|
||||
"@yarnpkg/lockfile" "^1.1.0"
|
||||
chalk "^2.4.2"
|
||||
cross-spawn "^6.0.5"
|
||||
find-yarn-workspace-root "^1.2.1"
|
||||
fs-extra "^7.0.1"
|
||||
is-ci "^2.0.0"
|
||||
klaw-sync "^6.0.0"
|
||||
minimist "^1.2.0"
|
||||
rimraf "^2.6.3"
|
||||
semver "^5.6.0"
|
||||
slash "^2.0.0"
|
||||
tmp "^0.0.33"
|
||||
|
||||
path-browserify@0.0.1:
|
||||
version "0.0.1"
|
||||
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user