aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/builds.yml20
-rw-r--r--build-helpers/notarize.js2
-rw-r--r--electron-builder.yml4
3 files changed, 11 insertions, 15 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 7af56cb51..c1e7b162b 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -171,23 +171,21 @@ jobs:
171 env: 171 env:
172 GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} 172 GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
173 CSC_IDENTITY_AUTO_DISCOVERY: true 173 CSC_IDENTITY_AUTO_DISCOVERY: true
174 # TODO: Commented out the code signing process for now (so as to at least get unsigned nightlies available for testing) 174 APPLEID: ${{ secrets.APPLEID }}
175 # APPLEID: ${{ secrets.APPLEID }} 175 APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
176 # APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} 176 CSC_LINK: ${{ secrets.CSC_LINK }}
177 # CSC_LINK: ${{ secrets.CSC_LINK }} 177 CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
178 # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
179 - name: Build Ferdium with publish for 'release' branch 178 - name: Build Ferdium with publish for 'release' branch
180 if: ${{ env.GIT_BRANCH_NAME == 'release' }} 179 if: ${{ env.GIT_BRANCH_NAME == 'release' }}
181 run: npm run build -- --publish always 180 run: npm run build -- --publish always
182 shell: bash 181 shell: bash
183 env: 182 env:
184 GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} 183 GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }}
185 CSC_IDENTITY_AUTO_DISCOVERY: false 184 CSC_IDENTITY_AUTO_DISCOVERY: true
186 # TODO: Commented out the code signing process for now (so as to at least get unsigned nightlies available for testing) 185 APPLEID: ${{ secrets.APPLEID }}
187 # APPLEID: ${{ secrets.APPLEID }} 186 APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
188 # APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} 187 CSC_LINK: ${{ secrets.CSC_LINK }}
189 # CSC_LINK: ${{ secrets.CSC_LINK }} 188 CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
190 # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
191 189
192 build_linux: 190 build_linux:
193 name: "ubuntu ${{ github.event.inputs.message }}" 191 name: "ubuntu ${{ github.event.inputs.message }}"
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index bbd81c7b6..21b1466e7 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -12,7 +12,7 @@ exports.default = async function notarizing(context) {
12 await notarize({ 12 await notarize({
13 appBundleId: 'org.ferdium.ferdium-app', 13 appBundleId: 'org.ferdium.ferdium-app',
14 appPath: `${appOutDir}/${appName}.app`, 14 appPath: `${appOutDir}/${appName}.app`,
15 ascProvider: 'B6J9X9DWFL', 15 ascProvider: '55E9FPJ93P',
16 appleId: process.env.APPLEID, 16 appleId: process.env.APPLEID,
17 appleIdPassword: process.env.APPLEID_PASSWORD, 17 appleIdPassword: process.env.APPLEID_PASSWORD,
18 }); 18 });
diff --git a/electron-builder.yml b/electron-builder.yml
index 142d3e2c3..d864a1848 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -26,9 +26,7 @@ dmg:
26 { x: 122, y: 240, type: file }, 26 { x: 122, y: 240, type: file },
27 ] 27 ]
28 28
29# TODO: When we have a registered developer account we need to uncomment this line so that the signing process can occur but without the notarization. 29afterSign: ./build-helpers/notarize.js
30# This is the notarization which would allow to have the DMG analysed so that it can be opened straight away after download.
31# afterSign: ./build-helpers/notarize.js
32 30
33protocols: 31protocols:
34 name: Ferdium 32 name: Ferdium