Skip to content

Commit 6283b7d

Browse files
authored
refactor: electron-builder workflow (#2579)
* refactor: electron-builder workflow Signed-off-by: Adam Setch <adam.setch@outlook.com> * bump Signed-off-by: Adam Setch <adam.setch@outlook.com> --------- Signed-off-by: Adam Setch <adam.setch@outlook.com>
1 parent bcfd0b9 commit 6283b7d

File tree

5 files changed

+70
-59
lines changed

5 files changed

+70
-59
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
- name: Package for ${{ matrix.platform }}
4343
run: ${{ matrix.package-cmd }}
4444
env:
45-
# For macOS
46-
CSC_LINK: ${{ secrets.CSC_LINK }}
47-
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
45+
# Signing certificates - important to use the correct cert per platform
46+
CSC_LINK: ${{ matrix.platform == 'macOS' && secrets.CSC_LINK || (matrix.platform == 'windows' && secrets.WIN_CSC_LINK || '') }}
47+
CSC_KEY_PASSWORD: ${{ matrix.platform == 'macOS' && secrets.CSC_KEY_PASSWORD || (matrix.platform == 'windows' && secrets.WIN_CSC_KEY_PASSWORD || '') }}
4848

4949
- name: Clean up builds
5050
shell: bash
@@ -54,5 +54,7 @@ jobs:
5454
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5555
with:
5656
name: ${{ matrix.artifact-name }}
57-
path: dist/
57+
path: |
58+
dist/*
59+
!dist/*/
5860
overwrite: true

.github/workflows/publish.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,22 @@ jobs:
4545
- name: Package and publish for ${{ matrix.platform }}
4646
run: ${{ matrix.package-cmd }}
4747
env:
48-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49-
# For macOS
48+
# Signing certificates - important to use the correct cert per platform
49+
CSC_LINK: ${{ matrix.platform == 'macOS' && secrets.CSC_LINK || (matrix.platform == 'windows' && secrets.WIN_CSC_LINK || '') }}
50+
CSC_KEY_PASSWORD: ${{ matrix.platform == 'macOS' && secrets.CSC_KEY_PASSWORD || (matrix.platform == 'windows' && secrets.WIN_CSC_KEY_PASSWORD || '') }}
51+
# macOS specific
5052
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
5153
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
5254
APPLE_ID_TEAM_ID: ${{ secrets.APPLE_ID_TEAM_ID }}
53-
CSC_LINK: ${{ secrets.CSC_LINK }}
54-
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
5555
NOTARIZE: ${{ matrix.use-apple-notarization }}
56+
# General
57+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5658

5759
- name: Upload artifacts
5860
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5961
with:
6062
name: ${{ matrix.artifact-name }}
61-
path: dist/
63+
path: |
64+
dist/*
65+
!dist/*/
6266
overwrite: true

config/electron-builder.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
const config = {
55
productName: 'Gitify',
66
appId: 'com.electron.gitify',
7-
copyright: 'Copyright © 2025 Gitify Team',
7+
copyright: 'Copyright © 2026 Gitify Team',
88
asar: true,
99
files: [
1010
'assets/images/*',
@@ -41,7 +41,12 @@ const config = {
4141
sign: false,
4242
},
4343
win: {
44-
target: 'nsis',
44+
target: [
45+
{
46+
target: 'nsis',
47+
arch: ['x64'],
48+
},
49+
],
4550
icon: 'assets/images/app-icon.ico',
4651
},
4752
nsis: {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"homepage": "https://gitify.io/",
7474
"dependencies": {
7575
"electron-log": "5.4.3",
76-
"electron-updater": "6.7.3",
76+
"electron-updater": "6.8.1",
7777
"menubar": "9.5.2",
7878
"react": "19.2.3",
7979
"react-dom": "19.2.3",
@@ -118,7 +118,7 @@
118118
"date-fns": "4.1.0",
119119
"dotenv": "17.2.3",
120120
"electron": "40.0.0",
121-
"electron-builder": "26.4.0",
121+
"electron-builder": "26.5.0",
122122
"final-form": "5.0.0",
123123
"graphql": "16.12.0",
124124
"html-webpack-plugin": "5.6.6",

pnpm-lock.yaml

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)