diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2022-05-01 12:47:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-01 17:47:27 +0000 |
commit | 66fbcecc116da8f0af5af16ab68ed728e8e5a32a (patch) | |
tree | 9a1c7a1d23f064a94bd02623e7ce7902248af340 | |
parent | Fix horizontal sidebar rendering overlapping the active service (#70) (diff) | |
download | ferdium-app-66fbcecc116da8f0af5af16ab68ed728e8e5a32a.tar.gz ferdium-app-66fbcecc116da8f0af5af16ab68ed728e8e5a32a.tar.zst ferdium-app-66fbcecc116da8f0af5af16ab68ed728e8e5a32a.zip |
Refactor 'electron-builder' configs to move into 'electron-builder.yml' (#79) [skip ci]
-rw-r--r-- | .github/workflows/builds.yml | 14 | ||||
-rw-r--r-- | electron-builder.yml | 58 |
2 files changed, 40 insertions, 32 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 46ca020fa..610826872 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -166,7 +166,7 @@ jobs: | |||
166 | shell: bash | 166 | shell: bash |
167 | - name: Build Ferdium with publish for 'nightly' branch | 167 | - name: Build Ferdium with publish for 'nightly' branch |
168 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 168 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
169 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 169 | run: npm run build -- --publish always |
170 | shell: bash | 170 | shell: bash |
171 | env: | 171 | env: |
172 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 172 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
@@ -178,7 +178,7 @@ jobs: | |||
178 | # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} | 178 | # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} |
179 | - name: Build Ferdium with publish for 'release' branch | 179 | - name: Build Ferdium with publish for 'release' branch |
180 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | 180 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} |
181 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 181 | run: npm run build -- --publish always |
182 | shell: bash | 182 | shell: bash |
183 | env: | 183 | env: |
184 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 184 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
@@ -263,7 +263,7 @@ jobs: | |||
263 | run: | | 263 | run: | |
264 | sudo snap install snapcraft --classic | 264 | sudo snap install snapcraft --classic |
265 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 265 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
266 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge | 266 | npm run build -- --publish always -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge |
267 | snapcraft logout | 267 | snapcraft logout |
268 | shell: bash | 268 | shell: bash |
269 | - name: Build Ferdium with publish for 'release' beta branch | 269 | - name: Build Ferdium with publish for 'release' beta branch |
@@ -275,7 +275,7 @@ jobs: | |||
275 | run: | | 275 | run: | |
276 | sudo snap install snapcraft --classic | 276 | sudo snap install snapcraft --classic |
277 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 277 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
278 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta | 278 | npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta |
279 | snapcraft logout | 279 | snapcraft logout |
280 | shell: bash | 280 | shell: bash |
281 | - name: Build Ferdium with publish for 'release' stable branch | 281 | - name: Build Ferdium with publish for 'release' stable branch |
@@ -287,7 +287,7 @@ jobs: | |||
287 | run: | | 287 | run: | |
288 | sudo snap install snapcraft --classic | 288 | sudo snap install snapcraft --classic |
289 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 289 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
290 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable | 290 | npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable |
291 | snapcraft logout | 291 | snapcraft logout |
292 | shell: bash | 292 | shell: bash |
293 | 293 | ||
@@ -364,7 +364,7 @@ jobs: | |||
364 | shell: bash | 364 | shell: bash |
365 | - name: Build Ferdium with publish for 'nightly' branch | 365 | - name: Build Ferdium with publish for 'nightly' branch |
366 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 366 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
367 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 367 | run: npm run build -- --publish always |
368 | shell: bash | 368 | shell: bash |
369 | env: | 369 | env: |
370 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 370 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
@@ -374,7 +374,7 @@ jobs: | |||
374 | # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} | 374 | # WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} |
375 | - name: Build Ferdium with publish for 'release' branch | 375 | - name: Build Ferdium with publish for 'release' branch |
376 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | 376 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} |
377 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 377 | run: npm run build -- --publish always |
378 | shell: bash | 378 | shell: bash |
379 | env: | 379 | env: |
380 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 380 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
diff --git a/electron-builder.yml b/electron-builder.yml index ebe16b29c..6c42fc3ea 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -4,6 +4,39 @@ directories: | |||
4 | 4 | ||
5 | appId: "org.ferdium.ferdium-app" | 5 | appId: "org.ferdium.ferdium-app" |
6 | 6 | ||
7 | publish: | ||
8 | provider: github | ||
9 | owner: ${ github.repository_owner } | ||
10 | |||
11 | snap: | ||
12 | publish: | ||
13 | provider: snapStore | ||
14 | |||
15 | nsis: | ||
16 | perMachine: false | ||
17 | oneClick: true | ||
18 | |||
19 | dmg: | ||
20 | background: ./build-helpers/images/dmgInstaller.tiff | ||
21 | icon: ./build-helpers/images/icon.icns | ||
22 | iconSize: 128 | ||
23 | contents: | ||
24 | [ | ||
25 | { x: 380, y: 240, type: link, path: /Applications }, | ||
26 | { x: 122, y: 240, type: file }, | ||
27 | ] | ||
28 | |||
29 | afterSign: ./build-helpers/notarize.js | ||
30 | |||
31 | protocols: | ||
32 | name: Ferdium | ||
33 | schemes: [ferdium] | ||
34 | |||
35 | asarUnpack: | ||
36 | - ./recipes | ||
37 | - ./assets/fonts | ||
38 | - ./assets/images/taskbar | ||
39 | |||
7 | mac: | 40 | mac: |
8 | hardenedRuntime: true | 41 | hardenedRuntime: true |
9 | gatekeeperAssess: false | 42 | gatekeeperAssess: false |
@@ -21,18 +54,6 @@ mac: | |||
21 | NSCameraUsageDescription: "This app requires camera access for video chats" | 54 | NSCameraUsageDescription: "This app requires camera access for video chats" |
22 | NSMicrophoneUsageDescription: "This app requires microphone access for voice chats" | 55 | NSMicrophoneUsageDescription: "This app requires microphone access for voice chats" |
23 | 56 | ||
24 | dmg: | ||
25 | background: ./build-helpers/images/dmgInstaller.tiff | ||
26 | icon: ./build-helpers/images/icon.icns | ||
27 | iconSize: 128 | ||
28 | contents: | ||
29 | [ | ||
30 | { x: 380, y: 240, type: link, path: /Applications }, | ||
31 | { x: 122, y: 240, type: file }, | ||
32 | ] | ||
33 | |||
34 | afterSign: ./build-helpers/notarize.js | ||
35 | |||
36 | win: | 57 | win: |
37 | icon: ./build-helpers/images/icon.ico | 58 | icon: ./build-helpers/images/icon.ico |
38 | target: | 59 | target: |
@@ -58,16 +79,3 @@ linux: | |||
58 | - target: rpm | 79 | - target: rpm |
59 | - target: freebsd | 80 | - target: freebsd |
60 | - target: snap | 81 | - target: snap |
61 | |||
62 | nsis: | ||
63 | perMachine: false | ||
64 | oneClick: true | ||
65 | |||
66 | protocols: | ||
67 | name: Ferdium | ||
68 | schemes: [ferdium] | ||
69 | |||
70 | asarUnpack: | ||
71 | - ./recipes | ||
72 | - ./assets/fonts | ||
73 | - ./assets/images/taskbar | ||