Skip to content

Commit

Permalink
Revert "Upgrade electron-builder, electron-updater and electron/notar…
Browse files Browse the repository at this point in the history
…ize (#1924)"

This reverts commit 1a2e05d.
  • Loading branch information
Alphrag authored Oct 14, 2024
1 parent 1a2e05d commit fb8a1b4
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 581 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# 'FERDIUM_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts)
# 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts)
# 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts)
# 'APPLE_TEAM_ID' (The TeamID in your Apple developer account - for notarizing the mac artifacts)
# 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts)
# 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts)
# 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts)
Expand Down Expand Up @@ -201,7 +200,6 @@ jobs:
CSC_IDENTITY_AUTO_DISCOVERY: true
APPLEID: ${{ secrets.APPLEID }}
APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
run: pnpm build --publish always
Expand Down
3 changes: 2 additions & 1 deletion build-helpers/notarize.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ exports.default = async function notarizing(context) {
const { notarize } = require('@electron/notarize');

await notarize({
tool: 'notarytool',
appPath: `${appOutDir}/${appName}.app`,
teamId: process.env.APPLE_TEAM_ID || '',
teamId: '55E9FPJ93P',
appleId: process.env.APPLEID || '',
appleIdPassword: process.env.APPLEID_PASSWORD || '',
});
Expand Down
5 changes: 2 additions & 3 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ win:
arch: [x64, ia32, arm64]
- target: portable
arch: [x64, ia32, arm64]
signtoolOptions:
# The name of the CN appearing in the certificate must be present in the publisherName list below
publisherName: ["Ferdium Contributors", "Ambroise Grau"]
# The name of the CN appearing in the certificate must be present in the publisherName list below
publisherName: ["Ferdium Contributors", "Ambroise Grau"]
# Remove the verification for a signature to allow auto-update without signed certificate
verifyUpdateCodeSignature: false

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"electron-dl": "3.5.2",
"electron-find": "1.0.7",
"electron-react-titlebar": "1.2.1",
"electron-updater": "6.4.0-alpha.0",
"electron-updater": "6.2.1",
"electron-window-state": "5.0.3",
"fast-folder-size": "2.2.0",
"fs-extra": "11.2.0",
Expand Down Expand Up @@ -135,7 +135,7 @@
"@biomejs/biome": "1.6.1",
"@commitlint/cli": "19.3.0",
"@commitlint/config-conventional": "19.2.2",
"@electron/notarize": "2.5.0",
"@electron/notarize": "2.3.2",
"@eslint-react/eslint-plugin": "1.5.12",
"@formatjs/cli": "6.2.12",
"@jest/types": "29.6.3",
Expand Down Expand Up @@ -164,7 +164,7 @@
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"electron": "32.2.0",
"electron-builder": "26.0.0-alpha.1",
"electron-builder": "24.13.3",
"esbuild": "0.16.17",
"esbuild-plugin-copy": "2.1.1",
"esbuild-runner": "2.2.2",
Expand Down
Loading

0 comments on commit fb8a1b4

Please sign in to comment.