Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-21 21:11:35 +01:00
Code Issues Projects Releases Wiki Activity

[PM-1691] Upgrade electron builder (#5038)

Browse Source 
* Upgrade electron builder

* Fix after-sign

* Allow singleArch

* Add CSC_FOR_PULL_REQUEST
This commit is contained in:
Oscar Hinton 2023-04-10 20:19:28 +02:00 committed by GitHub
parent 7263579eaf
commit 3a4a79d057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 653 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-desktop.yml vendored
View File

@ -775,6 +775,7 @@ jobs:
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
CSC_FOR_PULL_REQUEST: true
run: npm run pack:mac
- name: Upload .zip artifact
@ -972,6 +973,7 @@ jobs:
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
CSC_FOR_PULL_REQUEST: true
- name: Upload .pkg artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535

1
apps/desktop/electron-builder.json
View File

@ -66,6 +66,7 @@
],
"CFBundleDevelopmentRegion": "en"
},
"singleArchFiles": "node_modules/@bitwarden/desktop-native/desktop_native.darwin-*.node",
"target": ["dmg", "zip"]
},
"win": {

2
apps/desktop/scripts/after-sign.js
View File

@ -2,8 +2,8 @@
require("dotenv").config();
const path = require("path");
const { notarize } = require("@electron/notarize");
const { deepAssign } = require("builder-util");
const { notarize } = require("electron-notarize");
const fse = require("fs-extra");
exports.default = run;

1327
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -41,6 +41,8 @@
"@angular/compiler-cli": "^15.2.2",
"@angular/elements": "^15.2.2",
"@compodoc/compodoc": "^1.1.19",
"@electron/notarize": "^1.2.3",
"@electron/rebuild": "^3.2.10",
"@fluffy-spoon/substitute": "^1.208.0",
"@ngtools/webpack": "^15.2.2",
"@storybook/addon-a11y": "^6.5.16",
@ -86,7 +88,7 @@
"css-loader": "^6.5.1",
"del": "^6.0.0",
"electron": "21.3.1",
"electron-builder": "22.11.10",
"electron-builder": "^23.6.0",
"electron-log": "^4.4.8",
"electron-notarize": "^1.2.2",
"electron-rebuild": "^3.2.9",