Skip to content

Commit

Permalink
:electron: Notarize the mac desktop app (#3300)
Browse files Browse the repository at this point in the history
* adding notarization stuff back in

* win csc settings so win build doesnt try to sign with mac stuff

* windows doesnt need to know about mac build

* teamid env var instead of config val as per docs

* for testing purposes only

* probably wont work

* yet, didnt work

* try this

* update notarize

* removing test code

* add release notes
  • Loading branch information
MikesGlitch authored Aug 22, 2024
1 parent 1b70e59 commit 9108b63
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/electron-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@ jobs:
sudo flatpak install org.electronjs.Electron2.BaseApp/x86_64/23.08 -y
- name: Set up environment
uses: ./.github/actions/setup
- name: Build Electron
- name: Build Electron for Mac
if: ${{ startsWith(matrix.os, 'macos') }}
run: ./bin/package-electron
env:
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
# CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.CSC_LINK }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
- name: Build Electron
if: ${{ ! startsWith(matrix.os, 'macos') }}
run: ./bin/package-electron
- name: Upload Build
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"promise-retry": "^2.0.1"
},
"devDependencies": {
"@electron/notarize": "2.2.0",
"@electron/notarize": "2.4.0",
"@electron/rebuild": "3.6.0",
"@types/copyfiles": "^2",
"copyfiles": "^2.4.1",
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/3300.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MikesGlitch]
---

Sign the Mac desktop app to resolve damaged file errors
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1568,25 +1568,25 @@ __metadata:
languageName: node
linkType: hard

"@electron/notarize@npm:2.2.0":
version: 2.2.0
resolution: "@electron/notarize@npm:2.2.0"
"@electron/notarize@npm:2.2.1":
version: 2.2.1
resolution: "@electron/notarize@npm:2.2.1"
dependencies:
debug: "npm:^4.1.1"
fs-extra: "npm:^9.0.1"
promise-retry: "npm:^2.0.1"
checksum: 10/31639c9ee54d5ff2be7882c24916716b678b3c931b90cdea359262826b643c4291853cbaba8ecfc7cfddd75331117ef120fbd9c6a7b87c7d099ad54b6a2b0427
checksum: 10/6d5bb78a0ba0af59a07daf01ace17a33869893641639c94d0f74ca060698d8cf61fca4002c61592a70f6f20e03987fc1138625853d947394749b1bd46ed2db3c
languageName: node
linkType: hard

"@electron/notarize@npm:2.2.1":
version: 2.2.1
resolution: "@electron/notarize@npm:2.2.1"
"@electron/notarize@npm:2.4.0":
version: 2.4.0
resolution: "@electron/notarize@npm:2.4.0"
dependencies:
debug: "npm:^4.1.1"
fs-extra: "npm:^9.0.1"
promise-retry: "npm:^2.0.1"
checksum: 10/6d5bb78a0ba0af59a07daf01ace17a33869893641639c94d0f74ca060698d8cf61fca4002c61592a70f6f20e03987fc1138625853d947394749b1bd46ed2db3c
checksum: 10/fe97ac96e6cc93dae2cd5095bd157f5d9cb49c1a9606f0cb06216518e1c15fcfa76923de3d541544b63c5ff985c1ae43065453197a284352df95599e635877ac
languageName: node
linkType: hard

Expand Down Expand Up @@ -8354,7 +8354,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "desktop-electron@workspace:packages/desktop-electron"
dependencies:
"@electron/notarize": "npm:2.2.0"
"@electron/notarize": "npm:2.4.0"
"@electron/rebuild": "npm:3.6.0"
"@types/copyfiles": "npm:^2"
copyfiles: "npm:^2.4.1"
Expand Down

0 comments on commit 9108b63

Please sign in to comment.