Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-1691] Upgrade electron builder #5038

Merged
merged 7 commits into from
Apr 10, 2023
Merged

[PM-1691] Upgrade electron builder #5038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f396919
Upgrade electron builder
Hinton Mar 21, 2023
3200087
Fix after-sign
Hinton Mar 21, 2023
d507ac1
Allow singleArch
Hinton Mar 21, 2023
15025a8
Add CSC_FOR_PULL_REQUEST
Hinton Mar 21, 2023
85a0678
Merge branch 'master' of github.com:bitwarden/clients into ps/electro…
Hinton Mar 31, 2023
e0f3b87
Merge branch 'master' into ps/electron-builder
Hinton Apr 3, 2023
cf1dd89
Merge branch 'master' into ps/electron-builder
Hinton Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/electron-builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
],
"CFBundleDevelopmentRegion": "en"
},
"singleArchFiles": "node_modules/@bitwarden/desktop-native/desktop_native.darwin-*.node",
"target": ["dmg", "zip"]
},
"win": {
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/scripts/after-sign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading