diff options
-rw-r--r-- | .github/workflows/builds.yml | 33 | ||||
-rw-r--r-- | electron-builder.yml | 2 |
2 files changed, 16 insertions, 19 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 74ac7c1b9..3645f86da 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -258,42 +258,39 @@ jobs: | |||
258 | env: | 258 | env: |
259 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 259 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
260 | CSC_IDENTITY_AUTO_DISCOVERY: false | 260 | CSC_IDENTITY_AUTO_DISCOVERY: false |
261 | # TODO: Commented out the snapcraft artifact publishing for now (need to setup the snapcraft login, etc) | 261 | SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} |
262 | # SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} | ||
263 | run: | | 262 | run: | |
264 | # sudo snap install snapcraft --classic | 263 | sudo snap install snapcraft --classic |
265 | # echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 264 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
266 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 265 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} |
267 | # -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge | 266 | -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge |
268 | # snapcraft logout | 267 | snapcraft logout |
269 | shell: bash | 268 | shell: bash |
270 | - name: Build Ferdium with publish for 'release' beta branch | 269 | - name: Build Ferdium with publish for 'release' beta branch |
271 | if: ${{ env.GIT_BRANCH_NAME == 'release' && contains(env.PACKAGE_VERSION, 'beta') }} | 270 | if: ${{ env.GIT_BRANCH_NAME == 'release' && contains(env.PACKAGE_VERSION, 'beta') }} |
272 | env: | 271 | env: |
273 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 272 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
274 | CSC_IDENTITY_AUTO_DISCOVERY: false | 273 | CSC_IDENTITY_AUTO_DISCOVERY: false |
275 | # TODO: Commented out the snapcraft artifact publishing for now (need to setup the snapcraft login, etc) | 274 | SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} |
276 | # SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} | ||
277 | run: | | 275 | run: | |
278 | # sudo snap install snapcraft --classic | 276 | sudo snap install snapcraft --classic |
279 | # echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 277 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
280 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 278 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} |
281 | # -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta | 279 | -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta |
282 | # snapcraft logout | 280 | snapcraft logout |
283 | shell: bash | 281 | shell: bash |
284 | - name: Build Ferdium with publish for 'release' stable branch | 282 | - name: Build Ferdium with publish for 'release' stable branch |
285 | if: ${{ env.GIT_BRANCH_NAME == 'release' && !contains(env.PACKAGE_VERSION, 'beta') }} | 283 | if: ${{ env.GIT_BRANCH_NAME == 'release' && !contains(env.PACKAGE_VERSION, 'beta') }} |
286 | env: | 284 | env: |
287 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 285 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
288 | CSC_IDENTITY_AUTO_DISCOVERY: false | 286 | CSC_IDENTITY_AUTO_DISCOVERY: false |
289 | # TODO: Commented out the snapcraft artifact publishing for now (need to setup the snapcraft login, etc) | 287 | SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} |
290 | # SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} | ||
291 | run: | | 288 | run: | |
292 | # sudo snap install snapcraft --classic | 289 | sudo snap install snapcraft --classic |
293 | # echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 290 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
294 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} | 291 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} |
295 | # -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable | 292 | -c.snap.publish.provider=snapStore -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable |
296 | # snapcraft logout | 293 | snapcraft logout |
297 | shell: bash | 294 | shell: bash |
298 | 295 | ||
299 | build_windows: | 296 | build_windows: |
diff --git a/electron-builder.yml b/electron-builder.yml index 54f0ba2fe..ebe16b29c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -57,7 +57,7 @@ linux: | |||
57 | - target: tar.gz | 57 | - target: tar.gz |
58 | - target: rpm | 58 | - target: rpm |
59 | - target: freebsd | 59 | - target: freebsd |
60 | # - target: snap | 60 | - target: snap |
61 | 61 | ||
62 | nsis: | 62 | nsis: |
63 | perMachine: false | 63 | perMachine: false |