diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 1fb70c9ed1..610ce51ab3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -129,9 +129,9 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} CSC_KEY_PASSWORD: ${{ secrets.MAC_CSC_KEY_PASSWORD }} CSC_LINK: ${{ secrets.MAC_CSC_LINK }} - APPLEID: ${{ secrets.APPLE_ID }} - APPLEIDPASS: ${{ secrets.APPLE_ID_PASS }} - APPLETEAMID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} USE_HARD_LINKS: false diff --git a/packages/desktop/scripts/notarize.js b/packages/desktop/scripts/notarize.js index 031e5ad157..59b99c1ea0 100644 --- a/packages/desktop/scripts/notarize.js +++ b/packages/desktop/scripts/notarize.js @@ -2,26 +2,23 @@ const { notarize } = require('@electron/notarize') exports.default = async function notarizing(context) { - const { electronPlatformName, appOutDir } = context + const { electronPlatformName } = context + if (electronPlatformName !== 'darwin' || process.env.IS_E2E) { console.log('skipping notarization') return } - const appName = context.packager.appInfo.productFilename - console.log('notarization start') - try { - const response = await notarize({ - tool: 'notarytool', - appBundleId: 'com.yourcompany.yourAppId', - appPath: `${appOutDir}/${appName}.app`, - appleId: process.env.APPLEID, - appleIdPassword: process.env.APPLEIDPASS, - teamId: process.env.APPLETEAMID - }) - console.log('notarization done') - return response - } catch (e) { - console.error(e) - } + console.log('notarization started') + + const response = await notarize({ + tool: 'notarytool', + appleId: process.env.APPLE_ID, + appleIdPassword: process.env.APPLE_ID_PASS, + teamId: process.env.APPLE_TEAM_ID + }) + + console.log('notarization done') + + return response }