Notarize in afterSign step instead of afterPack

This commit is contained in:
Fedor Indutny 2022-02-24 12:24:48 -08:00 committed by GitHub
parent edcd005f5e
commit c11e9350d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions

View file

@ -401,6 +401,7 @@
},
"beforeBuild": "scripts/install-cross-deps.js",
"afterPack": "ts/scripts/after-pack.js",
"afterSign": "ts/scripts/after-sign.js",
"asarUnpack": [
"ts/workers/heicConverter.bundle.js",
"ts/sql/mainWorker.bundle.js",

View file

@ -6,14 +6,10 @@ import { afterPack as fuseElectron } from './fuse-electron';
import { afterPack as mergeASARs } from './merge-macos-asars';
import { afterPack as copyPacks } from './copy-language-packs';
import { afterPack as pruneMacOSRelease } from './prune-macos-release';
import { afterPack as notarize } from './notarize';
export async function afterPack(context: AfterPackContext): Promise<void> {
await pruneMacOSRelease(context);
await mergeASARs(context);
await fuseElectron(context);
await copyPacks(context);
// This must be the last step
await notarize(context);
}

12
ts/scripts/after-sign.ts Normal file
View file

@ -0,0 +1,12 @@
// Copyright 2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import type { AfterPackContext } from 'electron-builder';
import { afterSign as notarize } from './notarize';
// NOTE: It is AfterPackContext here even though it is afterSign.
// See: https://www.electron.build/configuration/configuration.html#aftersign
export async function afterSign(context: AfterPackContext): Promise<void> {
// This must be the last step
await notarize(context);
}

View file

@ -10,7 +10,7 @@ import * as packageJson from '../../package.json';
/* eslint-disable no-console */
export async function afterPack({
export async function afterSign({
appOutDir,
packager,
electronPlatformName,