diff options
-rw-r--r-- | .github/workflows/builds.yml | 22 | ||||
-rw-r--r-- | build-helpers/notarize.js | 2 | ||||
-rw-r--r-- | electron-builder.yml | 5 |
3 files changed, 14 insertions, 15 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 7af56cb51..7728a9e5c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -164,6 +164,8 @@ jobs: | |||
164 | if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }} | 164 | if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }} |
165 | run: npm run build -- --publish never | 165 | run: npm run build -- --publish never |
166 | shell: bash | 166 | shell: bash |
167 | env: | ||
168 | CSC_IDENTITY_AUTO_DISCOVERY: false | ||
167 | - name: Build Ferdium with publish for 'nightly' branch | 169 | - name: Build Ferdium with publish for 'nightly' branch |
168 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 170 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
169 | run: npm run build -- --publish always | 171 | run: npm run build -- --publish always |
@@ -171,23 +173,21 @@ jobs: | |||
171 | env: | 173 | env: |
172 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 174 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
173 | CSC_IDENTITY_AUTO_DISCOVERY: true | 175 | 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) | 176 | APPLEID: ${{ secrets.APPLEID }} |
175 | # APPLEID: ${{ secrets.APPLEID }} | 177 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} |
176 | # APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} | 178 | CSC_LINK: ${{ secrets.CSC_LINK }} |
177 | # CSC_LINK: ${{ secrets.CSC_LINK }} | 179 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} |
178 | # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} | ||
179 | - name: Build Ferdium with publish for 'release' branch | 180 | - name: Build Ferdium with publish for 'release' branch |
180 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | 181 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} |
181 | run: npm run build -- --publish always | 182 | run: npm run build -- --publish always |
182 | shell: bash | 183 | shell: bash |
183 | env: | 184 | env: |
184 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 185 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
185 | CSC_IDENTITY_AUTO_DISCOVERY: false | 186 | 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) | 187 | APPLEID: ${{ secrets.APPLEID }} |
187 | # APPLEID: ${{ secrets.APPLEID }} | 188 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} |
188 | # APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} | 189 | CSC_LINK: ${{ secrets.CSC_LINK }} |
189 | # CSC_LINK: ${{ secrets.CSC_LINK }} | 190 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} |
190 | # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} | ||
191 | 191 | ||
192 | build_linux: | 192 | build_linux: |
193 | name: "ubuntu ${{ github.event.inputs.message }}" | 193 | 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..a7763ebf0 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -26,9 +26,8 @@ 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. | 29 | # This is the notarization process which allows the app to be opened after download with the minimal warning. |
30 | # This is the notarization which would allow to have the DMG analysed so that it can be opened straight away after download. | 30 | afterSign: ./build-helpers/notarize.js |
31 | # afterSign: ./build-helpers/notarize.js | ||
32 | 31 | ||
33 | protocols: | 32 | protocols: |
34 | name: Ferdium | 33 | name: Ferdium |