diff options
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 6 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | src/config.ts | 4 | ||||
-rw-r--r-- | src/electron/ipc-api/autoUpdate.ts | 6 |
4 files changed, 4 insertions, 14 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index f0b6d7900..199ec95bf 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -171,7 +171,7 @@ jobs: | |||
171 | shell: bash | 171 | shell: bash |
172 | - name: Build Ferdi with publish for 'nightly' branch | 172 | - name: Build Ferdi with publish for 'nightly' branch |
173 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 173 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
174 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies | 174 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} |
175 | shell: bash | 175 | shell: bash |
176 | env: | 176 | env: |
177 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 177 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
@@ -285,7 +285,7 @@ jobs: | |||
285 | run: | | 285 | run: | |
286 | sudo snap install snapcraft --classic | 286 | sudo snap install snapcraft --classic |
287 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - | 287 | echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - |
288 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge | 288 | 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 |
289 | snapcraft logout | 289 | snapcraft logout |
290 | shell: bash | 290 | shell: bash |
291 | - name: Build Ferdi with publish for 'release' beta branch | 291 | - name: Build Ferdi with publish for 'release' beta branch |
@@ -404,7 +404,7 @@ jobs: | |||
404 | shell: bash | 404 | shell: bash |
405 | - name: Build Ferdi with publish for 'nightly' branch | 405 | - name: Build Ferdi with publish for 'nightly' branch |
406 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 406 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
407 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies | 407 | run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} |
408 | shell: bash | 408 | shell: bash |
409 | env: | 409 | env: |
410 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 410 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
@@ -245,7 +245,7 @@ We welcome all contributors. Please read the [contributing guidelines](CONTRIBUT | |||
245 | 245 | ||
246 | ## Nightly releases | 246 | ## Nightly releases |
247 | 247 | ||
248 | Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/nightlies](https://github.com/getferdi/nightlies/releases). Maintainers still need to manually publish the draft releases as pre-releases for now. | 248 | Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/ferdi](https://github.com/getferdi/ferdi/releases). Maintainers still need to verify and manually publish the draft releases as pre-releases for now. |
249 | 249 | ||
250 | ## Troubleshooting recipes (self-help) | 250 | ## Troubleshooting recipes (self-help) |
251 | 251 | ||
diff --git a/src/config.ts b/src/config.ts index 6ad58c7a5..667b0a962 100644 --- a/src/config.ts +++ b/src/config.ts | |||
@@ -158,10 +158,6 @@ export const FRANZ_SERVICE_REQUEST = `${GITHUB_FERDI_URL}/recipes/issues`; | |||
158 | export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi'; | 158 | export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi'; |
159 | export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; | 159 | export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; |
160 | 160 | ||
161 | export const GITHUB_ORG_NAME = 'getferdi'; | ||
162 | export const GITHUB_FERDI_REPO_NAME = 'ferdi'; | ||
163 | export const GITHUB_NIGHTLIES_REPO_NAME = 'nightlies'; | ||
164 | |||
165 | export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy']; | 161 | export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy']; |
166 | 162 | ||
167 | export const LOCAL_SERVER = 'You are using Ferdi without a server'; | 163 | export const LOCAL_SERVER = 'You are using Ferdi without a server'; |
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts index 31c614ab7..e6b805edc 100644 --- a/src/electron/ipc-api/autoUpdate.ts +++ b/src/electron/ipc-api/autoUpdate.ts | |||
@@ -1,6 +1,5 @@ | |||
1 | import { app, ipcMain, BrowserWindow } from 'electron'; | 1 | import { app, ipcMain, BrowserWindow } from 'electron'; |
2 | import { autoUpdater } from 'electron-updater'; | 2 | import { autoUpdater } from 'electron-updater'; |
3 | import { GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config'; | ||
4 | import { isMac, isWindows } from '../../environment'; | 3 | import { isMac, isWindows } from '../../environment'; |
5 | 4 | ||
6 | const debug = require('debug')('Ferdi:ipcApi:autoUpdate'); | 5 | const debug = require('debug')('Ferdi:ipcApi:autoUpdate'); |
@@ -26,11 +25,6 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => { | |||
26 | params.settings.app.get('nightly'), | 25 | params.settings.app.get('nightly'), |
27 | ); | 26 | ); |
28 | autoUpdater.channel = 'alpha'; | 27 | autoUpdater.channel = 'alpha'; |
29 | autoUpdater.setFeedURL({ | ||
30 | provider: 'github', | ||
31 | owner: GITHUB_ORG_NAME, | ||
32 | repo: GITHUB_NIGHTLIES_REPO_NAME, | ||
33 | }); | ||
34 | } | 28 | } |
35 | 29 | ||
36 | if (args.action === 'check') { | 30 | if (args.action === 'check') { |