diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 4649cfe0a..bc898827e 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -232,9 +232,9 @@ jobs: CI: 1 CSC_LINK: ${{ secrets.OSX_CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.OSX_CSC_KEY_PASSWORD }} - APPLEID: ${{ secrets.APPLEID }} - APPLETEAMID: ${{ secrets.APPLETEAMID }} - APPLEIDPASS: ${{ secrets.APPLEIDPASS }} + APPLE_ID: ${{ secrets.APPLEID }} + APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} USE_HARD_LINKS: false @@ -310,9 +310,9 @@ jobs: CI: 1 CSC_LINK: ${{ secrets.OSX_CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.OSX_CSC_KEY_PASSWORD }} - APPLEID: ${{ secrets.APPLEID }} - APPLETEAMID: ${{ secrets.APPLETEAMID }} - APPLEIDPASS: ${{ secrets.APPLEIDPASS }} + APPLE_ID: ${{ secrets.APPLEID }} + APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} USE_HARD_LINKS: false SKIP_LAUNCH_CHECK: true diff --git a/launcher/notarize.cjs b/launcher/notarize.cjs deleted file mode 100644 index eec986905..000000000 --- a/launcher/notarize.cjs +++ /dev/null @@ -1,25 +0,0 @@ -/* Based on https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/ */ - -const { notarize } = require('@electron/notarize') - -exports.default = async function notarizing(context) { - const { electronPlatformName, appOutDir } = context - if (electronPlatformName !== 'darwin') { - return - } - - if (!process.env.APPLEID || !process.env.APPLEIDPASS || !process.env.APPLETEAMID) { - console.log('Skipping notarizing, due to missing APPLEID, APPLETEAMID or APPLEIDPASS environment variables') - return - } - - const appName = context.packager.appInfo.productFilename - - return await notarize({ - appBundleId: 'companion.bitfocus.no', - appPath: `${appOutDir}/${appName}.app`, - appleId: process.env.APPLEID, - appleIdPassword: process.env.APPLEIDPASS, - teamId: process.env.APPLETEAMID, - }) -} diff --git a/launcher/package.json b/launcher/package.json index 22733e47c..dea40a7fd 100644 --- a/launcher/package.json +++ b/launcher/package.json @@ -25,7 +25,6 @@ "systeminformation": "^5.23.5" }, "devDependencies": { - "@electron/notarize": "^2.5.0", "@types/plist": "^3.0.5", "electron": "33.2.1", "electron-builder": "26.0.0-alpha.7", @@ -34,7 +33,7 @@ "build": { "productName": "Companion", "executableName": "Companion", - "appId": "test-companion.bitfocus.no", + "appId": "companion.bitfocus.no", "dmg": { "artifactName": "companion-mac-${arch}.dmg", "sign": true @@ -53,7 +52,6 @@ "entitlementsInherit": "entitlements.mac.plist" }, "afterPack": "fix-bundled-modules.cjs", - "afterSign": "notarize.cjs", "win": { "target": "nsis" }, diff --git a/yarn.lock b/yarn.lock index 52b250aa2..700421ea1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1192,7 +1192,6 @@ __metadata: resolution: "@companion-app/launcher@workspace:launcher" dependencies: "@companion-app/shared": "npm:*" - "@electron/notarize": "npm:^2.5.0" "@sentry/electron": "npm:^5.7.0" "@types/plist": "npm:^3.0.5" chokidar: "npm:^3.6.0" @@ -1480,7 +1479,7 @@ __metadata: languageName: node linkType: hard -"@electron/notarize@npm:2.5.0, @electron/notarize@npm:^2.5.0": +"@electron/notarize@npm:2.5.0": version: 2.5.0 resolution: "@electron/notarize@npm:2.5.0" dependencies: